From: Dave Hart <hart@ntp.org>
Date: Mon, 12 Oct 2009 15:38:35 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1339
X-Git-Tag: NTP_4_2_5P232_RC~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6135e87528518fbc55af22671611e4523cbaa1b4;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1339
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1302-37-9-keyword

bk: 4ad34d7bdFwBMJH_-5T7mMCewg391g
---

6135e87528518fbc55af22671611e4523cbaa1b4
diff --cc ChangeLog
index 92af75dd4,ff79a630d..25389b0bd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,4 +1,8 @@@
 +* [Bug 1302] OpenSSL under Windows needs applink support.
 +* [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...).
+ * [Bug 1339] Fix Windows-only ntp_strerror() infinite recursion.
 +* Construct ntpd keyword scanner finite state machine at compile time
 +  rather than at runtime, shrink entries from 40+ to 8 bytes.
  (4.2.5p231-RC) 2009/10/10 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1335] Broadcast client degraded by wildcard default change.
  (4.2.5p230-RC) 2009/10/09 Released by Harlan Stenn <stenn@ntp.org>