From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 14 Mar 2016 10:10:21 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a563d428503911348d9c9263b139bda06ed8ba2d;p=thirdparty%2Fntp.git

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

bk: 56e68e0dtbPA2KKARbOYZNVix4JiLA
---

a563d428503911348d9c9263b139bda06ed8ba2d
diff --cc ChangeLog
index 230bb9668,6048c38ab..8e864f1ba
--- a/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.