From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 10 Nov 2008 07:00:40 +0000 (-0500)
Subject: IPv6 interfaces were being looked for twice; fix bug 474
X-Git-Tag: NTP_4_2_5P138~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f09aa27442b7818a628a38215178df8e13bf7e21;p=thirdparty%2Fntp.git

IPv6 interfaces were being looked for twice; fix bug 474

bk: 4917dc18J-pEvlCPBDJFLDh0go5cdg
---

diff --git a/ChangeLog b/ChangeLog
index f5aa50576..5d153f8df 100644
--- 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 242fae687..b682ffd1e 100644
--- 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)