Merge psp-deb2.ntp.org:/home/stenn/ntp-stable-p15

into  psp-deb2.ntp.org:/home/stenn/ntp-stable-p15-sec

bk: 5edf704d9IwvfOkGfc2otlwO1196AQ

diff --cc ChangeLog
index acbab4ed20f3dcdfd27931010e99465ac331cfe0,4983037874e4cf41fb009d5a7c08e9134307e66f..136bf0847ab2a42696bb62797e0624f5d2e87af3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,10 @@@
  ---
 -(4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
 +(4.2.8p15) 2020/06/23 Released by Harlan Stenn <stenn@ntp.or>
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
+ * [Bug 3670] Regression from bad merge of 3592 and 3596 <perlinger@ntp.org>
+   - fixed a bad merge that happened before 4.2.8-p14. Thanks to
+     Sylar Tao for noticing this!
  * [Bug 3667] decodenetnum fails with numeric port <perlinger@ntp.org>
    - rewrite 'decodenetnum()' in terms of inet_pton
  * [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>

diff --cc NEWS
index 28d1321ee45db0dfe013440f95222390d42c1e79,30173d7211782a84baa2322dcfa4680afc2f175d..caf9ea664df5c52114dae251b3f73ba63224e54d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -10,9 -10,10 +10,11 @@@ authentication between ntpd from versio
  4.2.8p14/4.3.100 will leak a small amount of memory for each packet.
  Eventually, ntpd will run out of memory and abort.
  
- It also fixes 12 other bugs.
+ It also fixes 13 other bugs.
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
+ * [Bug 3670] Regression from bad merger between 3592 and 3596 <perlinger@>
+   - Thanks to Sylar Tao
  * [Bug 3667] decodenetnum fails with numeric port <perlinger@ntp.org>
    - rewrite 'decodenetnum()' in terms of inet_pton
  * [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>