diff options
| author | des <des@FreeBSD.org> | 2009-02-24 18:49:27 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-02-24 18:49:27 +0000 |
| commit | f4c3a2131f559534b5693fd15df8d89049db7cbb (patch) | |
| tree | e584c257bb55edd49609ecf2750698017a03411e /sshconnect.c | |
| parent | 2030f2e58830cb2a7f4793aa9ea16fa8da4e6cb0 (diff) | |
| download | FreeBSD-src-f4c3a2131f559534b5693fd15df8d89049db7cbb.zip FreeBSD-src-f4c3a2131f559534b5693fd15df8d89049db7cbb.tar.gz | |
Vendor import of OpenSSH 5.2p1
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sshconnect.c b/sshconnect.c index ec8ba33..c04aa10 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.211 2008/07/01 07:24:22 dtucker Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.212 2008/10/14 18:11:33 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -70,10 +70,6 @@ extern uid_t original_real_uid; extern uid_t original_effective_uid; extern pid_t proxy_command_pid; -#ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */ -#define INET6_ADDRSTRLEN 46 -#endif - static int show_other_keys(const char *, Key *); static void warn_changed_key(Key *); @@ -741,8 +737,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, if (options.host_key_alias == NULL && port != 0 && port != SSH_DEFAULT_PORT) { debug("checking without port identifier"); - if (check_host_key(hostname, hostaddr, 0, host_key, 2, - user_hostfile, system_hostfile) == 0) { + if (check_host_key(hostname, hostaddr, 0, host_key, + ROQUIET, user_hostfile, system_hostfile) == 0) { debug("found matching key w/out port"); break; } |
