diff options
Diffstat (limited to 'canohost.c')
-rw-r--r-- | canohost.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/canohost.c b/canohost.c index c27086bfd..0c4d36ff6 100644 --- a/canohost.c +++ b/canohost.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: canohost.c,v 1.44 2005/06/17 02:44:32 djm Exp $"); | 15 | RCSID("$OpenBSD: canohost.c,v 1.45 2005/10/03 07:44:42 dtucker Exp $"); |
16 | 16 | ||
17 | #include "packet.h" | 17 | #include "packet.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -43,9 +43,6 @@ get_remote_hostname(int sock, int use_dns) | |||
43 | cleanup_exit(255); | 43 | cleanup_exit(255); |
44 | } | 44 | } |
45 | 45 | ||
46 | if (from.ss_family == AF_INET) | ||
47 | check_ip_options(sock, ntop); | ||
48 | |||
49 | ipv64_normalise_mapped(&from, &fromlen); | 46 | ipv64_normalise_mapped(&from, &fromlen); |
50 | 47 | ||
51 | if (from.ss_family == AF_INET6) | 48 | if (from.ss_family == AF_INET6) |
@@ -55,6 +52,9 @@ get_remote_hostname(int sock, int use_dns) | |||
55 | NULL, 0, NI_NUMERICHOST) != 0) | 52 | NULL, 0, NI_NUMERICHOST) != 0) |
56 | fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed"); | 53 | fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed"); |
57 | 54 | ||
55 | if (from.ss_family == AF_INET) | ||
56 | check_ip_options(sock, ntop); | ||
57 | |||
58 | if (!use_dns) | 58 | if (!use_dns) |
59 | return xstrdup(ntop); | 59 | return xstrdup(ntop); |
60 | 60 | ||