aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/canohost.c
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2004-04-20 09:35:04 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2004-04-20 09:35:04 +0000
commit52028650dba51037ac82f766107619f336a00e25 (patch)
treeaaca3b36adea134d5ba39fa7c38bf759a9ef49c6 /crypto/openssh/canohost.c
parentefcad6b72fe9d4f7ea99c021f4903d09ca31b666 (diff)
downloadsrc-52028650dba51037ac82f766107619f336a00e25.tar.gz
src-52028650dba51037ac82f766107619f336a00e25.zip
Vendor import of OpenSSH 3.8.1p1.
Notes
Notes: svn path=/vendor-crypto/openssh/dist/; revision=128456
Diffstat (limited to 'crypto/openssh/canohost.c')
-rw-r--r--crypto/openssh/canohost.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/canohost.c b/crypto/openssh/canohost.c
index f5145922e6c8..a0067afc191d 100644
--- a/crypto/openssh/canohost.c
+++ b/crypto/openssh/canohost.c
@@ -44,6 +44,9 @@ get_remote_hostname(int socket, int use_dns)
cleanup_exit(255);
}
+ if (from.ss_family == AF_INET)
+ check_ip_options(socket, ntop);
+
ipv64_normalise_mapped(&from, &fromlen);
if (from.ss_family == AF_INET6)
@@ -56,9 +59,6 @@ get_remote_hostname(int socket, int use_dns)
if (!use_dns)
return xstrdup(ntop);
- if (from.ss_family == AF_INET)
- check_ip_options(socket, ntop);
-
debug3("Trying to reverse map address %.100s.", ntop);
/* Map the IP address to a host name. */
if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),