[Bug 1936] Correctly set IPV6_MULTICAST_LOOP

bk: 4de2f2b1DeLCEYeKck-sgUAkGTPMng

diff --git a/ChangeLog b/ChangeLog
index c6dbdd2f6b64122d00c3c01bd3b644ecd5fe4103..de978fb27689a9033d94e4f8c77b3439dcbd7002 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1936] Correctly set IPV6_MULTICAST_LOOP.
 (4.2.7p174) 2011/05/28 Released by Harlan Stenn <stenn@ntp.org>
 * ntpdc documentation cleanup.
 * sntp documentation cleanup.

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 1133b761d5f48b3753b25e45b5a0e83e31db181c..7f93f2c6ef17e3c1df5aa8f69802e8a23b9f349a 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -2265,7 +2265,12 @@ enable_multicast_if(
        )
 {
 #ifdef MCAST
+#ifdef IP_MULTICAST_LOOP
        TYPEOF_IP_MULTICAST_LOOP off = 0;
+#endif
+#ifdef IPV6_MULTICAST_LOOP
+       u_int off6 = 0;
+#endif
 
        NTP_REQUIRE(AF(maddr) == AF(&iface->sin));
 
@@ -2297,10 +2302,10 @@ enable_multicast_if(
                 */
                if (setsockopt(iface->fd, IPPROTO_IPV6,
                               IPV6_MULTICAST_LOOP,
-                              (char *) &off, sizeof(off))) {
+                              (char *) &off6, sizeof(off6))) {
 
                        msyslog(LOG_ERR,
-                               "setsockopt IP_MULTICAST_LOOP failed: %m on socket %d, addr %s for multicast address %s",
+                               "setsockopt IPV6_MULTICAST_LOOP failed: %m on socket %d, addr %s for multicast address %s",
                                iface->fd, stoa(&iface->sin),
                                stoa(maddr));
                }