From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 8 Jan 2017 05:59:21 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2645
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f318dc43a7952a708b77920c8008a18e9cca02e;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-2645
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-2645

bk: 5871d539XVQR-7D0mXCOVs069JvrHw
---

8f318dc43a7952a708b77920c8008a18e9cca02e
diff --cc ChangeLog
index 3ad4abffb,b25e6592e..29e7524b3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,12 @@@
  ---
+ 
+ * [Bug 2923] Trap Configuration Fail <perlinger@ntp.org>
+   - fixed dependency inversion from [Bug 2837]
 +* [Bug 2645] out-of-bound pointers in ctl_putsys and decode_bitflags
 +  - Fixed these and some more locations of this pattern.
 +    Probably din't get them all, though. <perlinger@ntp.org>
+ * Update copyright year.
+ 
  ---
  (4.2.8p9) 2016/11/21 Released by Harlan Stenn <stenn@ntp.org>