From: Juergen Perlinger <perlinger@ntp.org>
Date: Fri, 30 Dec 2016 09:39:31 +0000 (+0100)
Subject: [Bug 3356] Bugfix 3072 breaks multicastclient
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5953925bf87312902131f02a33e908beb653adce;p=thirdparty%2Fntp.git

[Bug 3356] Bugfix 3072 breaks multicastclient

bk: 58662b53ZwV8BJejPYblqOussZZZ_w
---

diff --git a/ChangeLog b/ChangeLog
index 0cb8c4fb4..eaa0010d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+---
+* [Bug 3356] Bugfix 3072 breaks multicastclient <perlinger@ntp.org>
+
 ---
 (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.8p9) 2016/MM/DD Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpd/ntp_peer.c b/ntpd/ntp_peer.c
index 04dee20c8..5afc1507c 100644
--- a/ntpd/ntp_peer.c
+++ b/ntpd/ntp_peer.c
@@ -309,7 +309,8 @@ findpeer(
 	for (p = peer_hash[hash]; p != NULL; p = p->adr_link) {
 
 		/* [Bug 3072] ensure interface of peer matches */
-		if (p->dstadr != rbufp->dstadr)
+		/* [Bug 3356] ... if NOT a broadcast peer!     */
+		if (p->hmode != MODE_BCLIENT && p->dstadr != rbufp->dstadr)
 			continue;
 
 		/* ensure peer source address matches */