From: Dave Hart <hart@ntp.org>
Date: Mon, 17 Oct 2011 20:14:44 +0000 (+0000)
Subject: [Bug 2034] interface ignore fe80::/64 mismatches ::, ::1...
X-Git-Tag: NTP_4_2_6P5_RC1~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8b528bd00e836dac0cada027c728b66fd9a2588;p=thirdparty%2Fntp.git

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

bk: 4e9c8cb4UmkWtAnVEOwvtaa3cEf5EA
---

diff --git a/ChangeLog b/ChangeLog
index daf1c0b30..295f0a21f 100644
--- 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 4855b8889..ab25b6e0a 100644
--- 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);