From: Frank Kardel <kardel@ntp.org>
Date: Sun, 11 Oct 2009 11:50:51 +0000 (+0000)
Subject: ntp_io.c, ChangeLog:
X-Git-Tag: NTP_4_2_5P232_RC~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=942058b7a7864e23d7f67ed54fc9ba1ef309fb74;p=thirdparty%2Fntp.git

ntp_io.c, ChangeLog:
  [Bug 1337] fix incorrect args to setsockopt(fd, IP_MULTICAST_IF,...)

bk: 4ad1c69bvpKYXhUDFMTiSpFmiYUXuQ
---

diff --git a/ChangeLog b/ChangeLog
index f86a5be54..3c010f201 100644
--- 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 7f3fd119e..2d47d1352 100644
--- 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,