Merge psp-deb1.ntp.org:/home/stenn/ntp-stable

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-3442

bk: 5b51a78a-i0XeQDBJk5CNAManC3Luw

diff --cc ChangeLog
index eddbf15b6b5d2f30bc69264cd74be60e0e631c51,6a8bbce3e58fadfb93d5c57ac116df705e803d6c..a3d788f709b920b07bc935686c8a8b6ef9ee19b4
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,50 -1,6 +1,53 @@@
 +---
 +
 +* [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>
 +  - applied patch by Gerry Garvey
 +* [Bug 3484] ntpq response from ntpd is incorrect when REFID is null <perlinger@ntp.org>
 +  - rework of ntpq 'nextvar()' key/value parsing
 +* [Bug 3482] Fixes for compilation warnings (ntp_io.c & ntpq-subs.c) <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey (with mods)
 +* [Bug 3480] Refclock sample filter not cleared on clock STEP <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3479] ctl_putrefid() allows unsafe characters through to ntpq <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey (with mods)
 +* [Bug 3476]ctl_putstr() sends empty unquoted string [...] <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey (with mods); not sure if that's bug or feature, though
 +* [Bug 3475] modify prettydate() to suppress output of zero time <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3474] Missing pmode in mode7 peer info response <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3471] Check for openssl/[ch]mac.h.  HStenn.
 +  - add #define ENABLE_CMAC support in configure.  HStenn.
 +* [Bug 3470] ntpd4.2.8p11 fails to compile without OpenSSL <perlinger@ntp.org>
 +* [Bug 3469] Incomplete string compare [...] in is_refclk_addr <perlinger@ntp.org>
 +  - patch by Stephen Friedl
 +* [Bug 3467] Potential memory fault in ntpq [...] <perlinger@ntp.org>
 +  - fixed IO redirection and CTRL-C handling in ntq and ntpdc
 +* [Bug 3465] Default TTL values cannot be used <perlinger@ntp.org>
 +* [Bug 3461] refclock_shm.c: clear error status on clock recovery <perlinger@ntp.org>
 +  - initial patch by Hal Murray; also fixed refclock_report() trouble
 +* [Bug 3456] Use uintptr_t rather than size_t to store an integer in a pointer
 +  - According to Brooks Davis, there was only one location <perlinger@ntp.org>
 +* [Bug 3449] ntpq - display "loop" instead of refid [...] <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3445] Symmetric peer won't sync on startup <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
+ * [Bug 3442] Fixes for ntpdate as suggested by Gerry Garvey,
+   with modifications
+   New macro REFID_ISTEXT() which is also used in ntpd/ntp_control.c.
 +* [Bug 3434] ntpd clears STA_UNSYNC on start <perlinger@ntp.org>
 +  - applied patch by Miroslav Lichvar
 +* [Sec 3012] noepeer tweaks.  <stenn@ntp.org>
 +* [Bug 3121] Drop root privileges for the forked DNS worker <perlinger@ntp.org>
 +  - integrated patch by  Reinhard Max
 +* [Bug 2821] minor build issues <perlinger@ntp.org>
 +  - applied patches by Christos Zoulas, including real bug fixes
 +* html/authopt.html: cleanup, from <stenn@ntp.org>
 +* ntpd/ntpd.c: DROPROOT cleanup.  <stenn@ntp.org>
  
  ---
  (4.2.8p11) 2018/02/27 Released by Harlan Stenn <stenn@ntp.org>
@@@ -60,10 -16,10 +63,10 @@@
  * [Sec 3012] Sybil vulnerability: noepeer support.  HStenn, JPerlinger.
  * [Bug 3457] OpenSSL FIPS mode regression <perlinger@ntp.org>
  * [Bug 3455] ntpd doesn't use scope id when binding multicast <perlinger@ntp.org>
-   - applied patch by Sean Haugh 
 - - applied patch by Sean Haugh
++ - applied patch by Sean Haugh 
  * [Bug 3452] PARSE driver prints uninitialized memory. <perlinger@ntp.org>
  * [Bug 3450] Dubious error messages from plausibility checks in get_systime()
 - - removed error log caused by rounding/slew, ensured postcondition <perlinger@ntp.org>
 +  - removed error log caused by rounding/slew, ensured postcondition <perlinger@ntp.org>
  * [Bug 3447] AES-128-CMAC (fixes) <perlinger@ntp.org>
    - refactoring the MAC code, too
  * [Bug 3441] Validate the assumption that AF_UNSPEC is 0.  stenn@ntp.org

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_control.c
index 8f311334cc2b31ec9862e7074c2729b52123c06c,72cb8c43b0b57850c545f13c66a8412193b06f8d..48cd908f9a84d6c69ced318b55a4631f2c87ce7b
--- 1/ntpd/ntp_control.c
--- 2/ntpd/ntp_control.c
+++ b/ntpd/ntp_control.c
@@@ -1630,17 -1628,17 +1630,17 @@@ ctl_putunqstr
        )
  {
        CtlMemBufT args[3];
-       
+ 
        args[0].buf = tag;
        args[0].len = strlen(tag);
 +      args[1].buf = "=";
 +      args[1].len = 1;
        if (data && len) {
 -          args[1].buf = "=";
 -          args[1].len = 1;
 -          args[2].buf = data;
 -          args[2].len = len;
 -          ctl_putdata_ex(args, 3, FALSE);
 +              args[2].buf = data;
 +              args[2].len = len;
 +              ctl_putdata_ex(args, 3, FALSE);
        } else {
 -          ctl_putdata_ex(args, 1, FALSE);
 +              ctl_putdata_ex(args, 2, FALSE);
        }
  }
  
@@@ -1764,9 -1762,9 +1764,9 @@@ ctl_putint
  {
        char buffer[24];        /*must fit 64bit int */
        int  rc;
-       
+ 
        rc = snprintf(buffer, sizeof(buffer), "%ld", ival);
 -      INSIST(rc >= 0 && rc < sizeof(buffer));
 +      INSIST(rc >= 0 && (size_t)rc < sizeof(buffer));
        ctl_putunqstr(tag, buffer, rc);
  }