From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 4 Jan 2020 09:31:25 +0000 (-0500)
Subject: Merge psp-deb2.ntp.org:/home/stenn/ntp-stable
X-Git-Tag: NTP_4_2_8P13~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14d91f9aa20db1454e9782b77628d8e56b50cb76;p=thirdparty%2Fntp.git

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

bk: 5e105b6dBM7bRalU1njqqskqhesWdQ
---

14d91f9aa20db1454e9782b77628d8e56b50cb76
diff --cc ChangeLog
index 8a033319b,f3816a92d..2b3ea9946
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,8 +1,10 @@@
  ---
  
- * [Sec 3610] process_control() should bail earlier on short packets. stenn@
-   - Reported by Philippe Antoine
 +* [Sec 3592] DoS attack on client ntpd <perlinger@ntp.org>
 +  - Reported by Miroslav Lichvar
+ * [Sec 3610] process_control() should bail earlier on short packets. stenn@
+   - Reported by Philippe Antoine
+ * [Bug 3634] Typo in discipline.html, reported by Jason Harrison.  stenn@
  * [Bug 3620] memory leak in ntpq sysinfo <perlinger@ntp.org>
    - applied patch by Gerry Garvey
  * [Bug 3619] Honour drefid setting in cooked mode and sysinfo <perlinger@ntp.org>