Import of OpenSSH 3.8.1p1

[gssapi-openssh.git] / openssh / canohost.c

diff --git a/openssh/canohost.c b/openssh/canohost.c
index f5145922e6c8050003e9e40d8eebe3d216ece2a8..a0067afc191dd0eab3d50dc95c2bd870ae722fb1 100644 (file)
--- a/openssh/canohost.c
+++ b/openssh/canohost.c
@@ -44,6 +44,9 @@ get_remote_hostname(int socket, int use_dns)
                cleanup_exit(255);
        }
 
+       if (from.ss_family == AF_INET)
+               check_ip_options(socket, ntop);
+
        ipv64_normalise_mapped(&from, &fromlen);
 
        if (from.ss_family == AF_INET6)
@@ -56,9 +59,6 @@ get_remote_hostname(int socket, int use_dns)
        if (!use_dns)
                return xstrdup(ntop);
 
-       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),