Merge psp-deb2.ntp.org:/home/perlinger/ntp-stable-3580

into  psp-deb2.ntp.org:/home/stenn/ntp-stable-p14

bk: 5d1dd8e8J835_P_yQalu3xd-198mvA

diff --cc ChangeLog
index b4da53103149add2e8f58395bfe67f1cc5057213,25d34924b0cea8a1555885f0f8a4b7d73b8fbf9c..da78b3229200fcdf68723acd30c289dba7b682fc
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,39 -1,6 +1,41 @@@
  ---
 +
+ * [Bug 3580] Possible bug ntpq-subs (NULL dereference in dogetassoc) <perlinger@ntp.org>
+   - Reported by Paulo Neves
 +* [Bug 3573] nptdate: missleading error message <perlinger@ntp.org>
 +* [Bug 3570] NMEA driver docs: talker ID not mentioned, typo <perlinger@ntp.org>
 +* [Bug 3569] cleanup MOD_NANO/STA_NANO handling for 'ntpadjtimex()' <perlinger@ntp.org>
 +  - sidekick: service port resolution in 'ntpdate'
 +* [Bug 3550] Reproducible build: Respect SOURCE_DATE_EPOCH <perlinger@ntp.org>
 +  - applied patch by Douglas Royds
 +* [Bug 3542] ntpdc monlist parameters cannot be set <perlinger@ntp.org>
 +* [Bug 3533] ntpdc peer_info ipv6 issues <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
 +* [Bug 3531] make check: test-decodenetnum fails <perlinger@ntp.org>
 +  - try to harden 'decodenetnum()' against 'getaddrinfo()' errors
 +  - fix wrong cond-compile tests in unit tests
 +* [Bug 3517] Reducing build noise <perlinger@ntp.org>
 +* [Bug 3516] Require tooling from this decade <perlinger@ntp.org>
 +  - patch by Philipp Prindeville
 +* [Bug 3515] Refactor ntpdmain() dispatcher loop and group common code <perlinger@ntp.org>
 +  - patch by Philipp Prindeville
 +* [Bug 3511] Get rid of AC_LANG_SOURCE() warnings <perlinger@ntp.org>
 +  - patch by Philipp Prindeville
 +* [Bug 3510] Flatten out the #ifdef nesting in ntpdmain() <perlinger@ntp.org>
 +  - partial application of patch by Philipp Prindeville
 +* [Bug 3491] Signed values of LFP datatypes should always display a sign
 +  - applied patch by Gerry Garvey & fixed unit tests <perlinger@ntp.org>
 +* [Bug 3490] Patch to support Trimble Resolution Receivers <perlinger@ntp.org>
 +  - applied (modified) patch by Richard Steedman
 +* [Bug 3132] Building 4.2.8p8 with disabled local libopts fails <perlinger@ntp.org>
 +  - applied patch by Miroslav Lichvar
 +* [Bug 3094] ntpd trying to listen for broadcasts on a completely ipv6 network
 +  <perlinger@ntp.org>
 +* [Bug 2420] ntpd doesn't run and exits with retval 0 when invalid user
 +             is specified with -u <perlinger@ntp.org>
 +  - monitor daemon child startup & propagate exit codes
 +* [Bug 1433] runtime check whether the kernel really supports capabilities
 +  - (modified) patch by Kurt Roeckx <perlinger@ntp.org>
  
  ---
  (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpq/ntpq-subs.c
index 8079a357540c065565728814cc086b5d36abead6,fde838a4984b73253767b922967a471b8ee17b08..406710bdf0f8f9ca665dfaa8cf376205486ef5f4
--- 1/ntpq/ntpq-subs.c
--- 2/ntpq/ntpq-subs.c
+++ b/ntpq/ntpq-subs.c
@@@ -1885,13 -1926,13 +1926,13 @@@ doprintpeers
                        stratum, type,
                        prettyinterval(whenbuf, sizeof(whenbuf),
                                       when(&ts, &rec, &reftime)),
-                       prettyinterval(pollbuf, sizeof(pollbuf), 
+                       prettyinterval(pollbuf, sizeof(pollbuf),
                                       (int)poll_sec),
 -                      reach, lfptoms(&estdelay, 3),
 +                      reach, ulfptoms(&estdelay, 3),
                        lfptoms(&estoffset, 3),
                        (have_jitter)
 -                          ? lfptoms(&estjitter, 3)
 -                          : lfptoms(&estdisp, 3));
 +                          ? ulfptoms(&estjitter, 3)
 +                          : ulfptoms(&estdisp, 3));
                return (1);
        }
        else