tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-29 08:44:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

- (djm) Reorder IP options check so that it isn't broken by

Browse Source 
mapped addresses; bz #1179 reported by markw wtech-llc.com;
   ok dtucker@
This commit is contained in:
Damien Miller 2006-04-18 15:13:16 +10:00
parent dfc6183f13
commit 2eaf37d899
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
20060418
- (djm) Reorder IP options check so that it isn't broken by
mapped addresses; bz #1179 reported by markw wtech-llc.com;
ok dtucker@
20060331 20060331
- OpenBSD CVS Sync - OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2006/03/27 01:21:18 - deraadt@cvs.openbsd.org 2006/03/27 01:21:18
@ -4495,4 +4500,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.4300 2006/03/31 12:14:57 djm Exp $ $Id: ChangeLog,v 1.4301 2006/04/18 05:13:16 djm Exp $

6
canohost.c
View File

@ -45,6 +45,9 @@ get_remote_hostname(int sock, int use_dns)
cleanup_exit(255); cleanup_exit(255);
} }
if (from.ss_family == AF_INET)
check_ip_options(sock, ntop);
ipv64_normalise_mapped(&from, &fromlen); ipv64_normalise_mapped(&from, &fromlen);
if (from.ss_family == AF_INET6) if (from.ss_family == AF_INET6)
@ -54,9 +57,6 @@ get_remote_hostname(int sock, int use_dns)
NULL, 0, NI_NUMERICHOST) != 0) NULL, 0, NI_NUMERICHOST) != 0)
fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed"); fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
if (from.ss_family == AF_INET)
check_ip_options(sock, ntop);
if (!use_dns) if (!use_dns)
return xstrdup(ntop); return xstrdup(ntop);