From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 31 May 2020 09:50:21 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d1d505c77b9b73e424b346c8306948a40a40e0a;p=thirdparty%2Fntp.git

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: 5ed37dddn6AtWg-0Dc0aR5IlFO2TuA
---

8d1d505c77b9b73e424b346c8306948a40a40e0a
diff --cc NEWS
index e280a66e7,fa0454953..e846d68a7
--- a/NEWS
+++ b/NEWS
@@@ -10,9 -10,8 +10,9 @@@ 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 11 other bugs.
+ It also fixes 12 other bugs.
  
 +* [Sec 3661] memory leak with AES128CMAC keys <perlinger@ntp.org>
  * [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>