pullup:

 646.   [bug]           The UnixWare ISC_PLATFORM_FIXIN6INADDR fix in isc/net.h
                        didn't _cleanly_ fix the problem it was trying to fix.

diff --git a/CHANGES b/CHANGES
index 4d03034d0cfe896f4b75cb8300871df016ac6feb..d7365f843d032346f87bd08b96da5e9741620a29 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 
- 645.  [port]          BSD/OS 3.0 needs pthread_init(). [RT #603]
+ 646.  [bug]           The UnixWare ISC_PLATFORM_FIXIN6INADDR fix in isc/net.h
+                       didn't _cleanly_ fix the problem it was trying to fix.
+
+ 645.  [port]          BSD/OS 3.0 needs pthread_init(). [RT #603]
 
  642.  [bug]           Break the exit_check() race in the zone module.
                        [RT #598]

diff --git a/lib/isc/unix/include/isc/net.h b/lib/isc/unix/include/isc/net.h
index b01e9cebf1854104c2b51fc9a11d0ba64fac8e22..3e6a07b2105b2e5b1b84e9fdf18f7cfa5abc3392 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 2000/12/08 00:55:32 tale Exp $ */
+/* $Id: net.h,v 1.24.4.1 2001/01/03 20:37:58 gson Exp $ */
 
 #ifndef ISC_NET_H
 #define ISC_NET_H 1
@@ -118,20 +118,20 @@ extern const struct in6_addr isc_net_in6addrany;
  * Fix UnixWare 7.1.1's broken IN6_IS_ADDR_* definitions.
  */
 #ifdef ISC_PLATFORM_FIXIN6ISADDR
-#define IN6_IS_ADDR_GEOGRAPHIC
+#undef  IN6_IS_ADDR_GEOGRAPHIC
 #define IN6_IS_ADDR_GEOGRAPHIC(a) (((a)->S6_un.S6_l[0] & 0xE0) == 0x80)
-#define IN6_IS_ADDR_IPX
-#define IN6_IS_ADDR_IPX(a)      (((a)->S6_un.S6_l[0] & 0xFE) == 0x04)
-#define IN6_IS_ADDR_LINKLOCAL
-#define IN6_IS_ADDR_LINKLOCAL(a) (((a)->S6_un.S6_l[0] & 0xC0FF) == 0x80FE)
-#define IN6_IS_ADDR_MULTICAST
-#define IN6_IS_ADDR_MULTICAST(a) (((a)->S6_un.S6_l[0] & 0xFF) == 0xFF)
-#define IN6_IS_ADDR_NSAP
-#define IN6_IS_ADDR_NSAP(a)     (((a)->S6_un.S6_l[0] & 0xFE) == 0x02)
-#define IN6_IS_ADDR_PROVIDER
-#define IN6_IS_ADDR_PROVIDER(a) (((a)->S6_un.S6_l[0] & 0xE0) == 0x40)
-#define IN6_IS_ADDR_SITELOCAL
-#define IN6_IS_ADDR_SITELOCAL(a) (((a)->S6_un.S6_l[0] & 0xC0FF) == 0xC0FE)
+#undef  IN6_IS_ADDR_IPX
+#define IN6_IS_ADDR_IPX(a)        (((a)->S6_un.S6_l[0] & 0xFE) == 0x04)
+#undef  IN6_IS_ADDR_LINKLOCAL
+#define IN6_IS_ADDR_LINKLOCAL(a)  (((a)->S6_un.S6_l[0] & 0xC0FF) == 0x80FE)
+#undef  IN6_IS_ADDR_MULTICAST
+#define IN6_IS_ADDR_MULTICAST(a)  (((a)->S6_un.S6_l[0] & 0xFF) == 0xFF)
+#undef  IN6_IS_ADDR_NSAP
+#define IN6_IS_ADDR_NSAP(a)       (((a)->S6_un.S6_l[0] & 0xFE) == 0x02)
+#undef  IN6_IS_ADDR_PROVIDER
+#define IN6_IS_ADDR_PROVIDER(a)   (((a)->S6_un.S6_l[0] & 0xE0) == 0x40)
+#undef  IN6_IS_ADDR_SITELOCAL
+#define IN6_IS_ADDR_SITELOCAL(a)  (((a)->S6_un.S6_l[0] & 0xC0FF) == 0xC0FE)
 #endif /* ISC_PLATFORM_FIXIN6ISADDR */
 
 /*