From: Linux Karlsson Date: Tue, 10 Aug 2010 23:44:16 +0000 (+0200) Subject: Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-dev-1595 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf3c244fa714c2a63bd1e90f7dcdf262de624bfa;p=thirdparty%2Fntp.git Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/bugs/ntp-dev-1595 into beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing bk: 4c61e450w8-lfbTkoRhVmf6bQkVJ9g --- bf3c244fa714c2a63bd1e90f7dcdf262de624bfa diff --cc ChangeLog index 0b909a13f2,8d19215aae..d4e41cbdc9 --- a/ChangeLog +++ b/ChangeLog @@@ -1,6 -1,5 +1,7 @@@ +* [Bug 1597] from 4.2.6p3-RC1: packet processing ignores RATE KoD packets, + Because of a bug in string comparison. - * [Bug 1595] empty last line in key file causes duplicate key to be added + * [Bug 1595] from 4.2.6p3-RC1: empty last line in key file causes + duplicate key to be added (4.2.7p41) 2010/07/28 Released by Harlan Stenn * [Bug 1581] from 4.2.6p3-beta1: ntp_intres.c size_t printf format string mismatch. @@@ -312,8 -311,7 +313,9 @@@ * [Bug 1407] configure.ac: recent GNU Make -v does not include "version". --- +* [Bug 1597] packet processing ignores RATE KoD packets, because of + a bug in string comparison. + * [Bug 1595] empty last line in key file causes duplicate key to be added --- (4.2.6p2) 2010/07/09 Released by Harlan Stenn