1428. [port] hpux: temporary work around of hpux 11.11 interface

                        scanning.

diff --git a/CHANGES b/CHANGES
index 63d30298bda74d7f942259398c62ca57ab318cc4..dffb7b68d8c3a5dc7f92c13c8158b204be3451cc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
        --- 9.2.2 released ---
 
+1428.  [port]          hpux: temporary work around of hpux 11.11 interface
+                       scanning.
+
 1427.  [bug]           Race condition in adb with threaded build.
 
 1426.   [cleanup]      Disable RFC2535 style DNSSEC.  This is incompatible

diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 062a7c0c231c5fcc9fd70b796f57bb61d4aff8d6..92ddc781d584eded865e60b730a4cb1c90dddfda 100644 (file)
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -15,12 +15,30 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.19.2.2 2001/12/12 00:16:47 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.19.2.2.4.1 2003/02/19 04:32:41 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
  * See netintro(4).
  */
+#ifdef __hpux
+#undef SIOCGLIFCONF
+#undef lifc_len
+#undef lifc_buf
+#undef lifc_req
+#undef lifconf
+#undef SIOCGLIFADDR
+#undef SIOCGLIFFLAGS
+#undef SIOCGLIFDSTADDR
+#undef SIOCGLIFNETMASK
+#undef lifr_addr
+#undef lifr_name
+#undef lifr_dstaddr
+#undef lifr_flags
+#undef ss_family
+#undef lifreq
+#endif
+
 #ifndef SIOCGLIFCONF
 #define SIOCGLIFCONF SIOCGIFCONF
 #define lifc_len ifc_len