mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-24 02:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection;

Browse Source 
with & ok dtucker@
This commit is contained in:
Damien Miller 2004-03-31 15:17:54 +10:00
parent 17addf0463
commit ccea020574
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,8 @@
Linuxes, since that's what many use. ok djm@ Linuxes, since that's what many use. ok djm@
- (dtucker) [auth-pam.c] rename the_authctxt to sshpam_authctxt in auth-pam.c - (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@ 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 20040327
- (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent - (dtucker) [session.c] Bug #817: Clear loginmsg after fork to prevent
@ -928,4 +930,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

6
canohost.c
View File

@ -44,6 +44,9 @@ get_remote_hostname(int socket, int use_dns)
cleanup_exit(255); cleanup_exit(255);
} }
if (from.ss_family == AF_INET)
check_ip_options(socket, ntop);
ipv64_normalise_mapped(&from, &fromlen); ipv64_normalise_mapped(&from, &fromlen);
if (from.ss_family == AF_INET6) if (from.ss_family == AF_INET6)
@ -56,9 +59,6 @@ get_remote_hostname(int socket, int use_dns)
if (!use_dns) if (!use_dns)
return xstrdup(ntop); return xstrdup(ntop);
if (from.ss_family == AF_INET)
check_ip_options(socket, ntop);
debug3("Trying to reverse map address %.100s.", ntop); debug3("Trying to reverse map address %.100s.", ntop);
/* Map the IP address to a host name. */ /* Map the IP address to a host name. */
if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name), if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),