pullup:

 910.   [port]          Some pre-RFC2133 IPv6 implementations do not define
                        IN6ADDR_ANY_INIT. [RT #1416]

diff --git a/CHANGES b/CHANGES
index 3e3d61996614e3a62344f3b53006f3c9636ac932..8d384e196b71cc927a9386fd9bb78c201c619c58 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
+
  911.  [bug]           Fail gracefully with multiple hint zones. [RT #1433]
 
+ 910.  [port]          Some pre-RFC2133 IPv6 implementations do not define
+                       IN6ADDR_ANY_INIT. [RT #1416]
+
        --- 9.1.3rc2 released ---
 
  904.  [bug]           The server would leak memory if attempting to use

diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index b9931b89829fc8708c542cd8f2f8d26d5a80033e..18539ca26c8c7e1917815d7979da75b2d5495cb1 100644 (file)
--- a/lib/isc/unix/include/isc/net.h
+++ b/lib/isc/unix/include/isc/net.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: net.h,v 1.24.4.3 2001/02/21 00:15:16 gson Exp $ */
+/* $Id: net.h,v 1.24.4.4 2001/06/25 22:17:02 gson Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
@@ -91,6 +91,29 @@
 #define in6_addr in_addr6      /* Required for pre RFC2133 implementations. */
 #endif
 
+/*
+ * Required for some pre RFC2133 implementations.
+ * IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT were added in
+ * draft-ietf-ipngwg-bsd-api-04.txt or draft-ietf-ipngwg-bsd-api-05.txt.  
+ * If 's6_addr' is defined then assume that there is a union and three
+ * levels otherwise assume two levels required.
+ */
+#ifndef IN6ADDR_ANY_INIT
+#ifdef s6_addr
+#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
+#else
+#define IN6ADDR_ANY_INIT { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } }
+#endif
+#endif
+
+#ifndef IN6ADDR_LOOPBACK_INIT
+#ifdef s6_addr
+#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
+#else
+#define IN6ADDR_LOOPBACK_INIT { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } }
+#endif
+#endif
+
 #ifndef AF_INET6
 #define AF_INET6 99
 #endif