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

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

diff --git a/ChangeLog b/ChangeLog
index 0c75ba47a5fce5f44098be49430946ee2b0ceedc..8c78a50220716f1780d06bd24f8e86b67ddbebe1 100644 (file)
--- 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

diff --git a/canohost.c b/canohost.c
index 35ae9bedecc2728f647b8df2527cbe504fd0a590..34b751a72c09dd645b2d6f5f1199157872ef264b 100644 (file)
--- 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);