summaryrefslogtreecommitdiff
path: root/canohost.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-04-18 15:13:16 +1000
committerDamien Miller <djm@mindrot.org>2006-04-18 15:13:16 +1000
commit2eaf37d899a55c253ad42d13534a824bce9c8ed2 (patch)
treeea5713004484f7d45d5d7e68992bd2b4243c11d4 /canohost.c
parentdfc6183f13d8c0d033d5b259eeb888b4f1236c2d (diff)
- (djm) Reorder IP options check so that it isn't broken by
mapped addresses; bz #1179 reported by markw wtech-llc.com; 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 35ae9bed..34b751a7 100644
--- a/canohost.c
+++ b/canohost.c
@@ -45,6 +45,9 @@ 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)
@@ -54,9 +57,6 @@ 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);