- (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection;

   with & ok dtucker@

1 files changed, 3 insertions, 3 deletions

diff --git a/canohost.c b/canohost.c
index f5145922..a0067afc 100644
--- a/canohost.c
+++ b/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),