From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 18 Aug 2010 06:31:47 +0000 (+0000)
Subject: Merge bk://bk1.ntp.org./ntp-dev
X-Git-Tag: NTP_4_2_7P42~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fcb1292bd7d8a0dad657894c738d6582055a0af;p=thirdparty%2Fntp.git

Merge bk://bk1.ntp.org./ntp-dev
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/hart/ntp-dev-1593

bk: 4c6b7e53nJrChI89rErvcQ9HW6XhFw
---

7fcb1292bd7d8a0dad657894c738d6582055a0af
diff --cc ChangeLog
index 49ac8f7d1,3ec867c51..e6794307e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,7 +1,8 @@@
 +* [Bug 1593] ntpd abort in free() with logconfig syntax error.
+ * [Bug 1595] from 4.2.6p3-RC1: empty last line in key file causes
+   duplicate key to be added
+ * [Bug 1597] from 4.2.6p3-RC1: packet processing ignores RATE KoD packets,
+   Because of a bug in string comparison.
  (4.2.7p41) 2010/07/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1581] from 4.2.6p3-beta1: ntp_intres.c size_t printf format
    string mismatch.