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

into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3022

bk: 56e68a1ave8qKQu-oAsl25P9fkoYVA

diff --cc ChangeLog
index 3e45f4a3ad3418a2b91775fcba0090c568f75a43,5592ce449846a3960c1185aefce48fe3be48ed02..6048c38abb52c19360771ae8c47efc5a1718bf53
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,15 -2,10 +2,19 @@@
  
  * [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org
  * [Bug 2995] Fixes to compile on Windows
 +* [Bug 2999] out-of-bounds access in 'is_safe_filename()'. perlinger@ntp.org
 +* [Bug 3013] Fix for ssl_init.c SHA1 test. perlinger@ntp.org
 +  - Patch provided by Ch. Weisgerber
 +* [Bug 3015] ntpq: config-from-file: "request contains an unprintable character"
 +  - A change related to [Bug 2853] forbids trailing white space in
 +    remote config commands. perlinger@ntp.org
+ * [Bug 3022] authkeys.c should be refactored. perlinger@ntp.org
+   - fixed memory leak in access list (auth[read]keys.c)
+   - refactored handling of key access lists (auth[read]keys.c)
+   - reduced number of error branches (authreadkeys.c)
 +* Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
 +* Fix typo in html/monopt.html.  Harlan Stenn.
  
  ---
  (4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>