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

diff --cc ChangeLog
index cbc6942bbbee508095cbc6ec610e5885266f839d,a3d788f709b920b07bc935686c8a8b6ef9ee19b4..60c002f3a511a0c221bbead844d1c3aaacf2a000
--- 1/ChangeLog
--- 2/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>

diff --cc ntpq/ntpq.c
Simple merge