From: Juergen Perlinger <perlinger@ntp.org>
Date: Fri, 2 Feb 2018 06:37:12 +0000 (+0100)
Subject: [Bug 3455] ntpd doesn't use scope id when binding multicast
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3afb006b4e047270cbaeb2b4bd4b6031e7f93118;p=thirdparty%2Fntp.git

[Bug 3455] ntpd doesn't use scope id when binding multicast

bk: 5a740718Ff1oP_fZLJWjsHnVysVHsg
---

diff --git a/ChangeLog b/ChangeLog
index cabeba3ca..1fd33d0f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
   - initial patch by <stenn@ntp.org>, extended by <perlinger@ntp.org>
 * [Sec 3412] ctl_getitem(): Don't compare names past NUL. <perlinger@ntp.org>
 * [Sec 3012] Sybil vulnerability: noepeer support.  HStenn, JPerlinger.
+* [Bug 3455] ntpd doesn't use scope id when binding multicast <perlinger@ntp.org>
+ - applied patch by Sean Haugh 
 * [Bug 3450] Dubious error messages from plausibility checks in get_systime()
  - removed error log caused by rounding/slew, ensured postcondition <perlinger@ntp.org>
 * [Bug 3447] AES-128-CMAC (fixes) <perlinger@ntp.org>
diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index b738de84e..87937a4a7 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -2730,6 +2730,7 @@ io_multicast_add(
 	if (ep->fd != INVALID_SOCKET) {
 		ep->ignore_packets = ISC_FALSE;
 		ep->flags |= INT_MCASTIF;
+		ep->ifindex = SCOPE(addr);
 
 		strlcpy(ep->name, "multicast", sizeof(ep->name));
 		DPRINT_INTERFACE(2, (ep, "multicast add ", "\n"));