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

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

bk: 56e68e0dtbPA2KKARbOYZNVix4JiLA

diff --cc ChangeLog
index 230bb9668b7f278658860d444dd380412998e0f0,6048c38abb52c19360771ae8c47efc5a1718bf53..8e864f1bae9975f623a03a44e1137ff843a6ab57
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -25,9 -8,11 +25,13 @@@
  * [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.
 +* Update html/xleave.html documentation.  Harlan Stenn.
 +* Update ntp.conf documentation.  Harlan Stenn.
  * Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
  * Fix typo in html/monopt.html.  Harlan Stenn.