IPv6 interfaces were being looked for twice; fix bug 474

bk: 4917dc18J-pEvlCPBDJFLDh0go5cdg

diff --git a/ChangeLog b/ChangeLog
index f5aa5057645ec59cf61ab244e06dec94d6ca4695..5d153f8df091ed4656e09ccf464c9af0303ef455 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* [Bug 474] --disable-ipv6 is broken.
+* IPv6 interfaces were being looked for twice.
 * SHM driver grabs more samples, add clockstats
 * decode.html and driver20.html updates from Dave Mills.
 (4.2.5p137) 2008/11/01 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 242fae6878781d72ac2864cda91f33afd5eb098d..b682ffd1e567c727830ca01543f70efbd85e0dfa 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -58,7 +58,7 @@
  * Set up some macros to look for IPv6 and IPv6 multicast
  */
 
-#if defined(ISC_PLATFORM_HAVEIPV6) && !defined(DISABLE_IPV6)
+#if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6)
 
 #define INCLUDE_IPV6_SUPPORT
 
@@ -1325,13 +1325,6 @@ update_interfaces(
                if(debug)
                        netsyslog(LOG_ERR, "no IPv6 interfaces found");
 #endif
-#endif
-       if (isc_net_probeipv6() == ISC_R_SUCCESS)
-               scan_ipv6 = ISC_TRUE;
-#if defined(ISC_PLATFORM_HAVEIPV6) && defined(DEBUG)
-       else
-               if(debug)
-                       netsyslog(LOG_ERR, "no IPv6 interfaces found");
 #endif
 
        if (isc_net_probeipv4() == ISC_R_SUCCESS)