From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 5 Oct 2015 11:13:04 +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=c3f38be6a4cd41f2b51d5a3f3444676e68d303a9;p=thirdparty%2Fntp.git

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

bk: 56125b40_p9f4bL9CtVZi7UXajxRKQ
---

c3f38be6a4cd41f2b51d5a3f3444676e68d303a9
diff --cc ChangeLog
index 49036a540,f668e1295..9c7390af2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,5 +1,11 @@@
  ---
 +* [Sec 2899] CVE-2014-9297  perlinger@ntp.org
 +* [Sec 2902] configuration directives "pidfile" and "driftfile"
 +  should be local-only. perlinger@ntp.org (patch by Miroslav Lichvar)
+ * [Sec 2909] added missing call to 'free()' in ntp_crypto.c. 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.