From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 20 Jul 2018 09:25:31 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p12-sec
X-Git-Tag: NTP_4_2_8P12~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ecb03dcfac9c6361018d17ebf3b3ce25b3b1c06;p=thirdparty%2Fntp.git

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

bk: 5b51aa8bl6AuIg4KuD8E0zlnEjTWxw
---

3ecb03dcfac9c6361018d17ebf3b3ce25b3b1c06
diff --cc ChangeLog
index cbc6942bb,a3d788f70..60c002f3a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
  ---
  
 +* [Sec 3505] CVE-2018-12327 - Arbitrary Code Execution Vulnerability
 +  - fixed stack buffer overflow in NTPQ/NTPDC <perlinger@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>
    - applied patch by Gerry Garvey
  * [Bug 3485] Undefined sockaddr used in error messages in ntp_config.c <perlinger@ntp.org>