summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-03-31 15:17:54 +1000
committerDamien Miller <djm@mindrot.org>2004-03-31 15:17:54 +1000
commitccea02057448dc475cd404a67c13e08a1ec8e660 (patch)
tree2ff1aacbea7c842f388203b407260393589adde6
parent17addf04639a3fa1bbe7c0b8d7acfbf1893e8e18 (diff)
- (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection;
with & ok dtucker@
-rw-r--r--ChangeLog4
-rw-r--r--canohost.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ff6a960e..e3f37e892 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 Linuxes, since that's what many use. ok djm@ 3 Linuxes, since that's what many use. ok djm@
4 - (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c 4 - (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c
5 to reduce potential confusion with the one in sshd.c. ok djm@ 5 to reduce potential confusion with the one in sshd.c. ok djm@
6 - (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection;
7 with & ok dtucker@
6 8
720040327 920040327
8 - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent 10 - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent
@@ -928,4 +930,4 @@
928 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 930 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
929 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 931 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
930 932
931$Id: ChangeLog,v 1.3298 2004/03/30 10:57:57 dtucker Exp $ 933$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)
44 cleanup_exit(255); 44 cleanup_exit(255);
45 } 45 }
46 46
47 if (from.ss_family == AF_INET)
48 check_ip_options(socket, ntop);
49
47 ipv64_normalise_mapped(&from, &fromlen); 50 ipv64_normalise_mapped(&from, &fromlen);
48 51
49 if (from.ss_family == AF_INET6) 52 if (from.ss_family == AF_INET6)
@@ -56,9 +59,6 @@ get_remote_hostname(int socket, int use_dns)
56 if (!use_dns) 59 if (!use_dns)
57 return xstrdup(ntop); 60 return xstrdup(ntop);
58 61
59 if (from.ss_family == AF_INET)
60 check_ip_options(socket, ntop);
61
62 debug3("Trying to reverse map address %.100s.", ntop); 62 debug3("Trying to reverse map address %.100s.", ntop);
63 /* Map the IP address to a host name. */ 63 /* Map the IP address to a host name. */
64 if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), 64 if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),