From: Dave Hart <hart@ntp.org>
Date: Sun, 11 Oct 2009 22:22:00 +0000 (+0000)
Subject: Merge pogo:/usa/kardel/main-line/ntp-dev-1337
X-Git-Tag: NTP_4_2_5P232_RC~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e66dca580c4914b3e8a2024f6a6b1d03e4b6e45f;p=thirdparty%2Fntp.git

Merge pogo:/usa/kardel/main-line/ntp-dev-1337
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1302-37-keyword

bk: 4ad25a883o7mbGrv5t1s9fXvPH02oA
---

e66dca580c4914b3e8a2024f6a6b1d03e4b6e45f
diff --cc ChangeLog
index f0cd98cfc,3c010f201..92af75dd4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 -* [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...)
 +* [Bug 1302] OpenSSL under Windows needs applink support.
++* [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...).
 +* 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>