diff options
| author | des <des@FreeBSD.org> | 2009-05-22 18:46:28 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-05-22 18:46:28 +0000 |
| commit | 8bf56a9772e08d79d1a808bb69be82ca688afc76 (patch) | |
| tree | d3b23c04145e95d8d26c4e6efa1cd05fa34fd795 /crypto/openssh/sshconnect.c | |
| parent | 56fa0af6738b5c4466957197aaa372d30e74440b (diff) | |
| parent | f4c3a2131f559534b5693fd15df8d89049db7cbb (diff) | |
| download | FreeBSD-src-8bf56a9772e08d79d1a808bb69be82ca688afc76.zip FreeBSD-src-8bf56a9772e08d79d1a808bb69be82ca688afc76.tar.gz | |
Upgrade to OpenSSH 5.2p1.
MFC after: 3 months
Diffstat (limited to 'crypto/openssh/sshconnect.c')
| -rw-r--r-- | crypto/openssh/sshconnect.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c index 52c8b18..cc21471 100644 --- a/crypto/openssh/sshconnect.c +++ b/crypto/openssh/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 $ */ /* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -71,10 +71,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 *); @@ -742,8 +738,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; } |
