- dtucker@cvs.openbsd.org 2005/10/03 07:44:42

     [canohost.c]
     Relocate check_ip_options call to prevent logging of garbage for
     connections with IP options set.  bz#1092 from David Leonard,
     "looks good" deraadt@

2 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 01a6f23d0..1a8a105d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,11 @@
    - jaredy@cvs.openbsd.org 2005/09/30 20:34:26
      [ssh-keyscan.1]
      deploy .An -nosplit; ok jmc
+   - dtucker@cvs.openbsd.org 2005/10/03 07:44:42
+     [canohost.c]
+     Relocate check_ip_options call to prevent logging of garbage for
+     connections with IP options set.  bz#1092 from David Leonard,
+     "looks good" deraadt@
 
 20050930
  - (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
@@ -3079,4 +3084,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.3913 2005/10/03 08:20:28 dtucker Exp $
+$Id: ChangeLog,v 1.3914 2005/10/03 08:23:44 dtucker Exp $
diff --git a/canohost.c b/canohost.c
index c27086bfd..0c4d36ff6 100644
--- a/canohost.c
+++ b/canohost.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.44 2005/06/17 02:44:32 djm Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.45 2005/10/03 07:44:42 dtucker Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -43,9 +43,6 @@ 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)
@@ -55,6 +52,9 @@ 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);