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

into  psp-deb1.ntp.org:/home/stenn/ntp-stable-2942

bk: 569b230dO-NrAwkDzk_j6W8otlHPBQ

diff --cc ChangeLog
index fe31e453a20d5d532a5b4a9b32e03df4640821d3,094d4f46043a0df3e18e67eb03dfe9a0b42809ce..fb72336a3e524be75dcd3e775512712354962efb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,32 -1,6 +1,33 @@@
  ---
  
 +* [Sec 2935] Deja Vu: Replay attack on authenticated broadcast mode. HStenn.
 +* [Sec 2937] ntpq: nextvar() missing length check. perlinger@ntp.org
 +* [Sec 2938] ntpq saveconfig command allows dangerous characters
 +  in filenames. perlinger@ntp.org
 +* [Sec 2939] reslist NULL pointer dereference.  perlinger@ntp.org
 +* [Sec 2940] Stack exhaustion in recursive traversal of restriction
 +  list. perlinger@ntp.org
+ * [Sec 2942]: Off-path DoS attack on auth broadcast mode.  HStenn.
 +* [Sec 2945] Zero Origin Timestamp Bypass. perlinger@ntp.org
 +* [Sec 2948] Potential Infinite Loop in ntpq ( and ntpdc) perlinger@ntp.org
 +* [Bug 2772] adj_systime overflows tv_usec. perlinger@ntp.org
 +* [Bug 2814] msyslog deadlock when signaled. perlinger@ntp.org
 +  - applied patch by shenpeng11@huawei.com with minor adjustments
 +* [Bug 2882] Look at ntp_request.c:list_peers_sum(). perlinger@ntp.org
 +* [Bug 2891] Deadlock in deferred DNS lookup framework. perlinger@ntp.org
 +* [Bug 2892] Several test cases assume IPv6 capabilities even when
 +             IPv6 is disabled in the build. perlinger@ntp.org
 +  - Found this already fixed, but validation led to cleanup actions.
 +* [Bug 2905] DNS lookups broken. perlinger@ntp.org
 +  - added limits to stack consumption, fixed some return code handling
 +* [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
 +  - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
 +  - make CTRL-C work for retrieval and printing od MRU list. perlinger@ntp.org
 +* [Bug 2980] reduce number of warnings. perlinger@ntp.org
 +  - integrated several patches from Havard Eidnes (he@uninett.no)
 +* [Bug 2985] bogus calculation in authkeys.c perlinger@ntp.org
 +  - implement 'auth_log2()' using integer bithack instead of float calculation
 +* Make leapsec_query debug messages less verbose.  Harlan Stenn.
  
  ---
  (4.2.8p5) 2016/01/07 Released by Harlan Stenn <stenn@ntp.org>

diff --cc include/ntp.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge