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

bk: 5a740718Ff1oP_fZLJWjsHnVysVHsg

diff --git a/ChangeLog b/ChangeLog
index cabeba3ca7ce39bbf0332ec1f59ad0fdab4e805e..1fd33d0f059af0338c53c6d55c59b852f59da700 100644 (file)
--- 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 b738de84e5ff9600015cb00a6c4a76baef4e5402..87937a4a74bacb9476472863edcebac0ed96a729 100644 (file)
--- 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"));