From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 9 Jun 2020 11:09:18 +0000 (-0400)
Subject: 3670
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e762af8337ba8b215587f9361950753c7b88f8d9;p=thirdparty%2Fntp.git

3670

bk: 5edf6ddetiKaHkWubNSCTAtoxIsw2A
---

diff --git a/ChangeLog b/ChangeLog
index 588342716..498303787 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 ---
 (4.2.8p15) 2020/04/xx Released by Harlan Stenn <stenn@ntp.or>
 
-* [Bug 3670] Deleted statements come back <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>
diff --git a/NEWS b/NEWS
index fa0454953..30173d721 100644
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,10 @@ authentication between ntpd from versions 4.2.8p11/4.3.97 and
 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.
 
+* [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>