Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15-sec

bk: 5eb7e6e1_jeN8oGME1Vi7lR_Vp3O0Q

diff --cc ChangeLog
index 48a7002f238c6278cd35d60597f98fdf6d145104,8435f36a548ea0f0fd4b0032899313ef7f313bed..e793ceaad32bd62947b04d17e045a63b4d2e75bb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,9 @@@
  ---
  (4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
+ * [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
+   - limit number of receive buffers, with an iron reserve for refclocks
  * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
  * [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
  * [Bug 3659] Move definition of psl[] from ntp_config.h to

diff --cc NEWS
index 4215ce0a4260c9cc05128c3fee45880f834b71cf,5c55d41f49a472d9150e7f1bbc18d58fa5556342..15b36a35df3d8c3028876e55f736b7bc2272765e
--- 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 8 other bugs.
+ It also fixes 9 other bugs.
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
+ * [Bug 3666] avoid unlimited receive buffer allocation <perlinger@ntp.org>
+   - limit number of receive buffers, with an iron reserve for refclocks
  * [Bug 3664] Enable openSSL CMAC support on Windows <burnicki@ntp.org>
  * [Bug 3662] Fix build errors on Windows with VS2008 <burnicki@ntp.org>
  * [Bug 3659] Move definition of psl[] from ntp_config.h to