From: Juergen Perlinger <perlinger@ntp.org>
Date: Sun, 11 Feb 2018 06:24:59 +0000 (+0100)
Subject: Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable-p11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf788664d57843d7d9ffddd871b321f9405b68d;p=thirdparty%2Fntp.git

Merge ssh://perlinger@psp-deb1.ntp.org//home/stenn/ntp-stable-p11
into  ntp.org:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-p11-3455

bk: 5a7fe1bb2nsQ9ahJ2AXst8w897924Q
---

1cf788664d57843d7d9ffddd871b321f9405b68d
diff --cc ChangeLog
index 8bdcd4ca1,1fd33d0f0..629fa2fc0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -9,8 -6,8 +9,10 @@@
    - 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 3457] OpenSSL FIPS mode regression <perlinger@ntp.org>
+ * [Bug 3455] ntpd doesn't use scope id when binding multicast <perlinger@ntp.org>
+  - applied patch by Sean Haugh 
 +* [Bug 3452] PARSE driver prints uninitialized memory. <perlinger@ntp.org>
  * [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>