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

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

bk: 59e2a977ol0VeOPRX6a-b_nB52bE-A

diff --cc ChangeLog
index cb6837ede949f7f6e622138c04b7eec30c6b4812,b8b3e58a34123c1cac480fbe85fdca1d3426eb73..468f8645afb5108b7a3b6e36ab2b3ab7a8650e3d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,48 -1,9 +1,49 @@@
  ---
 +
 +* [Bug 3439] When running multiple commands / hosts in ntpq... <perlinger@ntp.org>
 + - applied patch by ggarvey
 +* [Bug 3438] Negative values and values > 999 days in... <perlinger@ntp.org>
 + - applied patch by ggarvey (with minor mods)
+ * [Bug 3435] anchor NTP era alignment <perlinger@ntp.org>
 +* [Bug 3430] ntpq dumps core (SIGSEGV) for "keytype md2"
 +  - fixed several issues with hash algos in ntpd, sntp, ntpq,
 +    ntpdc and the test suites <perlinger@ntp.org>
 +* [Bug 3424] Trimble Thunderbolt 1024 week millenium bug <perlinger@ntp.org>
 +  - initial patch by Daniel Pouzzner
 +* [Bug 3423] QNX adjtime() implementation error checking is
 +  wrong <perlinger@ntp.org>
 +* [Bug 3417] ntpq ifstats packet counters can be negative
 +  made IFSTATS counter quantities unsigned <perlinger@ntp.org>
 +* [Bug 3411] problem about SIGN(6) packet handling for ntp-4.2.8p10
 +  - raised receive buffer size to 1200 <perlinger@ntp.org>
 +* [Bug 3408] refclock_jjy.c: Avoid a wrong report of the coverity static
 +  analysis tool. <abe@ntp.org>
 +* [Bug 3399] NTP: linker error in 4.2.8p10 during Linux cross-compilation
 +  - initial patch by timeflies@mail2tor.com  <perlinger@ntp.org>
 +* [Bug 3398] tests fail with core dump <perlinger@ntp.org>
 +  - patch contributed by Alexander Bluhm
 +* [Bug 3397] ctl_putstr() asserts that data fits in its buffer
 +  rework of formatting & data transfer stuff in 'ntp_control.c'
 +  avoids unecessary buffers and size limitations. <perlinger@ntp.org>
 +* [Bug 3394] Leap second deletion does not work on ntpd clients
 +  - fixed handling of dynamic deletion w/o leap file <perlinger@ntp.org>
 +* [Bug 3391] ntpd segfaults on startup due to small warmup thread stack size
 +  - increased mimimum stack size to 32kB <perlinger@ntp.org>
 +* [Bug 3367] Faulty LinuxPPS NMEA clock support in 4.2.8 <perlinger@ntp.org>
 +  - reverted handling of PPS kernel consumer to 4.2.6 behavior
 +* [Bug 3365] Updates driver40(-ja).html and miscopt.html <abe@ntp.org>
 +* [Bug 3358] Spurious KoD log messages in .INIT. phase.  HStenn.
 +* [Bug 3016] wrong error position reported for bad ":config pool"
 +  - fixed location counter & ntpq output <perlinger@ntp.org>
 +* [Bug 2737] Wrong phone number listed for USNO. ntp-bugs@bodosom.net,
 +  perlinger@ntp.org
 +* [Bug 2557] Fix Thunderbolt init. ntp-bugs@bodosom.net, perlinger@ntp.
 +* [Bug 948] Trustedkey config directive leaks memory. <perlinger@ntp.org>
 +* Use strlcpy() to copy strings, not memcpy().  HStenn.
 +* test_ntp_scanner_LDADD needs ntpd/ntp_io.o.  HStenn.
  
  ---
 -(4.2.8p10-win-beta1) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
 -(4.2.8p10)
 +(4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
  
  * [Sec 3389] NTP-01-016: Denial of Service via Malformed Config
    (Pentest report 01.2017) <perlinger@ntp.org>

diff --cc html/miscopt.html
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_parser.h
Simple merge

diff --cc ntpd/ntp_parser.y
Simple merge