From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 25 Mar 2007 21:49:44 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P20~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf7f5392e6f9ea8f9d0ebf9d055abb65cb52cc1c;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev

bk: 4606ee78pBRX7OxWCIYhlUVxGlzYHg
---

bf7f5392e6f9ea8f9d0ebf9d055abb65cb52cc1c
diff --cc ChangeLog
index 16693a443,9252eec94..2ff266f1e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 789] Fix multicast client crypto authentication and make sure arriving
+ 	    multicast packets do not disturb the autokey dance.
 +* [Bug 787] Bug fixes for 64-bit time_t on Windows.
  * [Bug 796] Clean up duplicate #defines in ntp_control.c.
  * [Bug 569] Use the correct precision for the Leitch CSD-5300.
  * [Bug 795] Moved declaration of variable to top of function.