diff options
| author | Damien Miller <djm@mindrot.org> | 2004-03-31 07:17:54 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-03-31 07:17:54 +0200 |
| commit | ccea02057448dc475cd404a67c13e08a1ec8e660 (patch) | |
| tree | 2ff1aacbea7c842f388203b407260393589adde6 | |
| parent | - (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c (diff) | |
| download | openssh-ccea02057448dc475cd404a67c13e08a1ec8e660.tar.xz openssh-ccea02057448dc475cd404a67c13e08a1ec8e660.zip | |
- (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection;
with & ok dtucker@
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | canohost.c | 6 |
2 files changed, 6 insertions, 4 deletions
@@ -3,6 +3,8 @@ Linuxes, since that's what many use. ok djm@ - (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c to reduce potential confusion with the one in sshd.c. ok djm@ + - (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection; + with & ok dtucker@ 20040327 - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent @@ -928,4 +930,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3298 2004/03/30 10:57:57 dtucker Exp $ +$Id: ChangeLog,v 1.3299 2004/03/31 05:17:54 djm Exp $ diff --git a/canohost.c b/canohost.c index f5145922e..a0067afc1 100644 --- a/canohost.c +++ b/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), |