Merge pogo:/usa/kardel/main-line/ntp-dev-1337

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1337-42

bk: 4ad698b6quijkgN-Hg5q5V03MQfRoQ

diff --cc ChangeLog
index 0777a83855e541f32f6ee2e5c0ba53c62858bf60,ddc9c2ffe9fde13d19eed232fae1d9659f6c3d77..157e56313f0e57a4eae9f86285608ce0f9036548
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,5 +1,16 @@@
 -* [Bug 1337] cast address pointer to void *
++* [Bug 1337] cast setsockopt() v4 address pointer to void *.
 +* [Bug 1342] ignore|drop one IPv6 address on an interface blocks all
 +  addresses on that interface.
 +(4.2.5p232-RC) 2009/10/14 Released by Harlan Stenn <stenn@ntp.org>
 +* [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.
 +* [Bug 1341] NMEA driver requires working PPSAPI #ifdef HAVE_PPSAPI.
 +* Construct ntpd keyword scanner finite state machine at compile time
 +  rather than at runtime, shrink entries from 40+ to 8 bytes.
 +* Update documentation for ntpq --old-rv, saveconfig, saveconfigdir,
 +  ntpd -I -L and -M, and interface/nic rules. (From Dave Hart)
+ * [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...)
  (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>

diff --cc ntpd/ntp_io.c
Simple merge