diff options
| author | Damien Miller <djm@mindrot.org> | 2006-04-18 07:13:16 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-04-18 07:13:16 +0200 |
| commit | 2eaf37d899a55c253ad42d13534a824bce9c8ed2 (patch) | |
| tree | ea5713004484f7d45d5d7e68992bd2b4243c11d4 /canohost.c | |
| parent | - djm@cvs.openbsd.org 2006/03/31 09:13:56 (diff) | |
| download | openssh-2eaf37d899a55c253ad42d13534a824bce9c8ed2.tar.xz openssh-2eaf37d899a55c253ad42d13534a824bce9c8ed2.zip | |
- (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 '')
| -rw-r--r-- | canohost.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/canohost.c b/canohost.c index 35ae9bede..34b751a72 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); |