[Bug 3356] Bugfix 3072 breaks multicastclient

bk: 58662b53ZwV8BJejPYblqOussZZZ_w

diff --git a/ChangeLog b/ChangeLog
index 0cb8c4fb4779b249944c144baf63c35be953e531..eaa0010d365515a362fa49e6ac42f4889080f0d9 100644 (file)
--- 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 04dee20c89823036720ecb2d97888f81c44ed23c..5afc1507c5b4bf584cc6b4b446f358f08b0c32ad 100644 (file)
--- 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 */