diff options
| author | pettai <pettai> | 2010-03-27 13:37:33 +0000 |
|---|---|---|
| committer | pettai <pettai> | 2010-03-27 13:37:33 +0000 |
| commit | 815a8315c05506147ae844b27f8f62184d693912 (patch) | |
| tree | de9f9ff5cfa17c56d7c5aa2fed5c2bbf801d3707 | |
| parent | 98a3f3021eb91424d63ca46dfe43a1e54c5aa38a (diff) | |
| download | pkgsrc-815a8315c05506147ae844b27f8f62184d693912.tar.gz | |
Fixed brokenness of patch-ad
Ok'ed during freeze by wiz@
| -rw-r--r-- | net/nmap/distinfo | 4 | ||||
| -rw-r--r-- | net/nmap/patches/patch-ad | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/nmap/distinfo b/net/nmap/distinfo index 4aa0f0c09e2..878f4ca564a 100644 --- a/net/nmap/distinfo +++ b/net/nmap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2010/03/21 21:58:23 pettai Exp $ +$NetBSD: distinfo,v 1.42 2010/03/27 13:37:33 pettai Exp $ SHA1 (nmap-5.21.tar.bz2) = ce5ff792161dae0037e41b31e0c2ef683ce94655 RMD160 (nmap-5.21.tar.bz2) = 85e912c3c6a7ed03eb1b399c812836071e4dcf9f @@ -6,5 +6,5 @@ Size (nmap-5.21.tar.bz2) = 10015121 bytes SHA1 (patch-aa) = 61593e0479a79bcb4cce2e88b2e5753fa14bc429 SHA1 (patch-ab) = 22c377e9a340a6e6d7b9a36b63e6ffc47a084b3b SHA1 (patch-ac) = c22e8f6411b1152a6e7582c90e5ec5bd4c6acaad -SHA1 (patch-ad) = 607225d4f0d1e9a7ea5f73aee79e71c6995f1c64 +SHA1 (patch-ad) = 9ce85af817e3d057b461316b2b2b526e6373a82b SHA1 (patch-aj) = 868440ce24a70c1a747af6d65eed24f20c4bb892 diff --git a/net/nmap/patches/patch-ad b/net/nmap/patches/patch-ad index a559835c735..bbb514329ec 100644 --- a/net/nmap/patches/patch-ad +++ b/net/nmap/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.14 2010/03/21 21:58:23 pettai Exp $ +$NetBSD: patch-ad,v 1.15 2010/03/27 13:37:34 pettai Exp $ Correct handling of the length of data returned by SIOCGIFCONF. The actual length of each item is never less than sizeof(struct ifreq), but @@ -40,7 +40,7 @@ had two problems: + data extends beyond the end of ifr_ifru. */ len = sizeof(struct ifreq); +#if HAVE_SOCKADDR_SA_LEN -+ len = ifr->ifr_addr.sa_len > sizeof(ifr->ifr_name); ++ if (ifr->ifr_addr.sa_len > sizeof(ifr->ifr_ifru)) + len += (ifr->ifr_addr.sa_len - sizeof(ifr->ifr_ifru)); #endif |