- itojun@cvs.openbsd.org 2002/06/11 08:11:45

     [canohost.c]
     use "ntop" only after initialized

diff --git a/ChangeLog b/ChangeLog
index 4647fe75df2dca2358ee410f9cf5452a2b43dbe6..f27ab1d99b13ff2154ba0689425e2a771251d2b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,9 @@
      [auth-krb4.c monitor.h serverloop.c session.c ssh-agent.c sshd.c]
      pid_t cleanup. Markus need this now to keep hacking.
      markus@, millert@ ok
+   - itojun@cvs.openbsd.org 2002/06/11 08:11:45
+     [canohost.c]
+     use "ntop" only after initialized
 
 20020609
  - (bal) OpenBSD CVS Sync

diff --git a/canohost.c b/canohost.c
index 03005aa29c8c9da023f2d90406987e77602f3bcd..00c499ca041fb96cdcc9d3cdece2e90865196ef7 100644 (file)
--- a/canohost.c
+++ b/canohost.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.31 2002/02/27 21:23:13 stevesk Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.32 2002/06/11 08:11:45 itojun Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -64,13 +64,14 @@ get_remote_hostname(int socket, int verify_reverse_mapping)
                }
        }
 #endif
-       if (from.ss_family == AF_INET)
-               check_ip_options(socket, ntop);
 
        if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop),
            NULL, 0, NI_NUMERICHOST) != 0)
                fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
 
+       if (from.ss_family == AF_INET)
+               check_ip_options(socket, ntop);
+
        debug3("Trying to reverse map address %.100s.", ntop);
        /* Map the IP address to a host name. */
        if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),