pullup:

 687.   [bug]           Only say we have IPv6, with sufficent functionality,
                        if it has actually been tested.  [RT #586]

diff --git a/CHANGES b/CHANGES
index 5069826e62811776778f126d14809ae829b046e4..50159f285f9f8a2b57c4bed156d104bd03072cd5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 687.  [bug]           Only say we have IPv6, with sufficent functionality,
+                       if it has actually been tested.  [RT #586]
+
  684.  [bug]           Memory leak with view forwarders. [RT #656]
 
  683.  [bug]           File descriptor leak in isc_lex_openfile().

diff --git a/lib/isc/unix/net.c b/lib/isc/unix/net.c
index 240f10d81e23445470761506103af1830050ca69..dc9b88c4234ec5c9bafad1589f8c2934889bceba 100644 (file)
--- a/lib/isc/unix/net.c
+++ b/lib/isc/unix/net.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.c,v 1.16.2.1 2001/01/09 22:51:21 bwelling Exp $ */
+/* $Id: net.c,v 1.16.2.2 2001/01/17 17:30:50 gson Exp $ */
 
 #include <config.h>
 
@@ -122,8 +122,6 @@ initialize_action(void) {
 #ifdef WANT_IPV6
 #ifdef ISC_PLATFORM_HAVEIN6PKTINFO
        ipv6_result = try_proto(PF_INET6);
-#else
-       ipv6_result = 0;
 #endif
 #endif
 #endif