summaryrefslogtreecommitdiff
path: root/sshconnect.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sshconnect.c b/sshconnect.c
index ec8ba33e0..c04aa1057 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.211 2008/07/01 07:24:22 dtucker Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.212 2008/10/14 18:11:33 stevesk Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -70,10 +70,6 @@ extern uid_t original_real_uid;
70extern uid_t original_effective_uid; 70extern uid_t original_effective_uid;
71extern pid_t proxy_command_pid; 71extern pid_t proxy_command_pid;
72 72
73#ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */
74#define INET6_ADDRSTRLEN 46
75#endif
76
77static int show_other_keys(const char *, Key *); 73static int show_other_keys(const char *, Key *);
78static void warn_changed_key(Key *); 74static void warn_changed_key(Key *);
79 75
@@ -741,8 +737,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
741 if (options.host_key_alias == NULL && port != 0 && 737 if (options.host_key_alias == NULL && port != 0 &&
742 port != SSH_DEFAULT_PORT) { 738 port != SSH_DEFAULT_PORT) {
743 debug("checking without port identifier"); 739 debug("checking without port identifier");
744 if (check_host_key(hostname, hostaddr, 0, host_key, 2, 740 if (check_host_key(hostname, hostaddr, 0, host_key,
745 user_hostfile, system_hostfile) == 0) { 741 ROQUIET, user_hostfile, system_hostfile) == 0) {
746 debug("found matching key w/out port"); 742 debug("found matching key w/out port");
747 break; 743 break;
748 } 744 }