[Bug 2034] interface ignore fe80::/64 mismatches ::, ::1...

bk: 4e9c8cb4UmkWtAnVEOwvtaa3cEf5EA

diff --git a/ChangeLog b/ChangeLog
index daf1c0b30a2d8ff7ab2458d41a3df9fcacfc2221..295f0a21f0507bddc986c6779f3b869f48b85a6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 ---
-(4.2.6p4) 2011/09/23 Released by Harlan Stenn <stenn@ntp.org>
+
+* [Bug 2034] interface ignore fe80::/64 mismatches ::, ::1...
+
+---
 (4.2.6p4) 2011/09/22 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 1984] ntp/libisc fails to compile on OS X 10.7 (Lion).

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 4855b8889890e864ea20ec2caccf3310d39b49d6..ab25b6e0acc580c59e38779958d6e6762f9c5864 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -721,12 +721,12 @@ addr_eqprefix(
 
        memset(&isc_sa, 0, sizeof(isc_sa));
        memcpy(&isc_sa.type.sa, &a->sa, 
-              min(sizeof(isc_sa.type), sizeof(a)));
+              min(sizeof(isc_sa.type), sizeof(*a)));
        isc_netaddr_fromsockaddr(&isc_a, &isc_sa);
 
        memset(&isc_sa, 0, sizeof(isc_sa));
        memcpy(&isc_sa.type.sa, &b->sa, 
-              min(sizeof(isc_sa.type), sizeof(b)));
+              min(sizeof(isc_sa.type), sizeof(*b)));
        isc_netaddr_fromsockaddr(&isc_b, &isc_sa);
 
        return (int)isc_netaddr_eqprefix(&isc_a, &isc_b,
@@ -1355,8 +1355,11 @@ interface_action(
        int             isloopback;
        int             iswildcard;
 
-       DPRINTF(4, ("interface_action: interface %s ",
-                   (if_name != NULL) ? if_name : "wildcard"));
+       DPRINTF(4, ("interface_action: %s %s ",
+                   (if_name != NULL)
+                       ? if_name
+                       : "wildcard",
+                   stoa(if_addr)));
 
        iswildcard = is_wildcard_addr(if_addr);