From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 18 Aug 2010 05:17:31 +0000 (+0000)
Subject: Merge psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/bugs/ntp... 
X-Git-Tag: NTP_4_2_6P3_BETA1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c316108f54a984b2c8aa906e8aaa4b7db182188c;p=thirdparty%2Fntp.git

Merge psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/bugs/ntp-stable-1597
into  psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/bugs/ntp-stable-1595-7

bk: 4c6b6cebOh_MlXMQ33v1Mhk10JcEzg
---

c316108f54a984b2c8aa906e8aaa4b7db182188c
diff --cc ChangeLog
index b747f715f,3e2f88ded..0cca80e8e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,8 @@@
  ---
  
 +* [Bug 1595] empty last line in key file causes duplicate key to be added
+ * [Bug 1597] packet processing ignores RATE KoD packets, because of
+   a bug in string comparison.
  
  ---
  (4.2.6p2) 2010/07/09 Released by Harlan Stenn <stenn@ntp.org>