diff options
author | Damien Miller <djm@mindrot.org> | 2006-04-18 15:13:16 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-04-18 15:13:16 +1000 |
commit | 2eaf37d899a55c253ad42d13534a824bce9c8ed2 (patch) | |
tree | ea5713004484f7d45d5d7e68992bd2b4243c11d4 | |
parent | dfc6183f13d8c0d033d5b259eeb888b4f1236c2d (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@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | canohost.c | 6 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ | |||
1 | 20060418 | ||
2 | - (djm) Reorder IP options check so that it isn't broken by | ||
3 | mapped addresses; bz #1179 reported by markw wtech-llc.com; | ||
4 | ok dtucker@ | ||
5 | |||
1 | 20060331 | 6 | 20060331 |
2 | - OpenBSD CVS Sync | 7 | - OpenBSD CVS Sync |
3 | - deraadt@cvs.openbsd.org 2006/03/27 01:21:18 | 8 | - deraadt@cvs.openbsd.org 2006/03/27 01:21:18 |
@@ -4495,4 +4500,4 @@ | |||
4495 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4500 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4496 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4501 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4497 | 4502 | ||
4498 | $Id: ChangeLog,v 1.4300 2006/03/31 12:14:57 djm Exp $ | 4503 | $Id: ChangeLog,v 1.4301 2006/04/18 05:13:16 djm Exp $ |
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) | |||
45 | cleanup_exit(255); | 45 | cleanup_exit(255); |
46 | } | 46 | } |
47 | 47 | ||
48 | if (from.ss_family == AF_INET) | ||
49 | check_ip_options(sock, ntop); | ||
50 | |||
48 | ipv64_normalise_mapped(&from, &fromlen); | 51 | ipv64_normalise_mapped(&from, &fromlen); |
49 | 52 | ||
50 | if (from.ss_family == AF_INET6) | 53 | if (from.ss_family == AF_INET6) |
@@ -54,9 +57,6 @@ get_remote_hostname(int sock, int use_dns) | |||
54 | NULL, 0, NI_NUMERICHOST) != 0) | 57 | NULL, 0, NI_NUMERICHOST) != 0) |
55 | fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed"); | 58 | fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed"); |
56 | 59 | ||
57 | if (from.ss_family == AF_INET) | ||
58 | check_ip_options(sock, ntop); | ||
59 | |||
60 | if (!use_dns) | 60 | if (!use_dns) |
61 | return xstrdup(ntop); | 61 | return xstrdup(ntop); |
62 | 62 | ||