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

   mapped addresses; bz #1179 reported by markw wtech-llc.com;
   ok dtucker@

2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c9d43691..5328aa9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
  - OpenBSD CVS Sync
    - deraadt@cvs.openbsd.org 2006/03/27 01:21:18
@@ -4495,4 +4500,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.4300 2006/03/31 12:14:57 djm Exp $
+$Id: ChangeLog,v 1.4301 2006/04/18 05:13:16 djm Exp $
diff --git a/canohost.c b/canohost.c
index 35ae9bed..34b751a7 100644
--- a/canohost.c
+++ b/canohost.c
@@ -45,6 +45,9 @@ get_remote_hostname(int sock, int use_dns)
 		cleanup_exit(255);
 	}
 
+	if (from.ss_family == AF_INET)
+		check_ip_options(sock, ntop);
+
 	ipv64_normalise_mapped(&from, &fromlen);
 
 	if (from.ss_family == AF_INET6)
@@ -54,9 +57,6 @@ get_remote_hostname(int sock, int use_dns)
 	    NULL, 0, NI_NUMERICHOST) != 0)
 		fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
 
-	if (from.ss_family == AF_INET)
-		check_ip_options(sock, ntop);
-
 	if (!use_dns)
 		return xstrdup(ntop);