From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 5 Oct 2015 10:44:46 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-sec
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5cdd84ca467572a5561c1d5f426345f452caddd;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-sec
into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-cve2014-9297

bk: 5612549eNAy88abr_79QR4vwMZ8GLQ
---

e5cdd84ca467572a5561c1d5f426345f452caddd
diff --cc ChangeLog
index ae4fca08b,c6d360991..17a6b1f07
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,8 @@@
  ---
+ * CVE-2014-9297  perlinger@ntp.org
 +* [Bug 2332] (reopened) Exercise thread cancellation once before dropping
 +  privileges and limiting resources in NTPD removes the need to link
 +  forcefully against 'libgcc_s' which does not always work. J.Perlinger
  * [Bug 2595] ntpdate man page quirks.  Hal Murray, Harlan Stenn.
  * [Bug 2625] Deprecate flag1 in local refclock.  Hal Murray, Harlan Stenn.
  * [Bug 2817] Stop locking ntpd into memory by default under Linux.  H.Stenn.