ntp_io.c, ChangeLog:

  [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...)

bk: 4ad1c69bvpKYXhUDFMTiSpFmiYUXuQ

diff --git a/ChangeLog b/ChangeLog
index f86a5be54bb2b40e1c8ba9fd3ac529a378df0b51..3c010f201723cd6765b6370b91bec71cd50eaff9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [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 --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 7f3fd119ed3f584161995b793d7a285694b4ae3b..2d47d13523d949dfdbe7c52bc8409a93c488cd71 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -2120,7 +2120,7 @@ enable_multicast_if(
 
        case AF_INET:
                if (setsockopt(iface->fd, IPPROTO_IP, IP_MULTICAST_IF,
-                              (char *)NSRCADR(&iface->sin),
+                              &NSRCADR(&iface->sin),
                               sizeof(NSRCADR(&iface->sin)))) {
 
                        msyslog(LOG_ERR,