From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 21 Jul 2018 04:27:12 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8a6e3506f186a74d13b2bb42cc1e44bddcdf4f5;p=thirdparty%2Fntp.git

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

bk: 5b52b620rBEUTLmJIBjUTq0Po0keog
---

b8a6e3506f186a74d13b2bb42cc1e44bddcdf4f5
diff --cc ChangeLog
index 60c002f3a,29c037bd0..ce13b704a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,8 @@@
  ---
  
 +* [Sec 3505] CVE-2018-12327 - Arbitrary Code Execution Vulnerability
 +  - fixed stack buffer overflow in NTPQ/NTPDC <perlinger@ntp.org>
+ * [Sec 3012] noepeer tweaks.  <stenn@ntp.org>
  * [Bug 3506] Service Control Manager interacts poorly with NTPD <perlinger@ntp.org>
    - changed interaction with SCM to signal pending startup
  * [Bug 3486] Buffer overflow in ntpq/ntpq.c:tstflags() <perlinger@ntp.org>