summaryrefslogtreecommitdiff
path: root/canohost.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-03-31 15:17:54 +1000
committerDamien Miller <djm@mindrot.org>2004-03-31 15:17:54 +1000
commitccea02057448dc475cd404a67c13e08a1ec8e660 (patch)
tree2ff1aacbea7c842f388203b407260393589adde6 /canohost.c
parent17addf04639a3fa1bbe7c0b8d7acfbf1893e8e18 (diff)
- (djm) Bug #825: Fix ip_options_check() for mapped IPv4/IPv6 connection;
with & ok dtucker@
Diffstat (limited to 'canohost.c')
-rw-r--r--canohost.c6
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),