pullup:

1087.   [bug]           libbind: struct __res_state to large on 64 bit arch.
(including later fix known as change 1284 in BIND 8)

diff --git a/CHANGES b/CHANGES
index 64ac0bc66de0ac516b575714114ca896cb5555ba..fafc245b873f2a7c7340ff3cc187457e20da9af6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,8 @@
 
 1088.  [port]          libbind: MPE/iX C.70 (incomplete)
 
+1087.  [bug]           libbind: struct __res_state too large on 64 bit arch.
+
 1086.  [port]          libbind: sunos: old sprintf.
 
 1085.  [port]          libbind: solaris: sys_nerr and sys_errlist do not

diff --git a/lib/bind/include/resolv.h b/lib/bind/include/resolv.h
index fe63fe7e767368947f70e596b2e83aef799e1379..3352051c01d87712f13d792df6e1c7f9312210c6 100644 (file)
--- a/lib/bind/include/resolv.h
+++ b/lib/bind/include/resolv.h
@@ -50,7 +50,7 @@
 
 /*
  *     @(#)resolv.h    8.1 (Berkeley) 6/2/93
- *     $Id: resolv.h,v 1.7.2.1 2001/11/02 21:32:52 gson Exp $
+ *     $Id: resolv.h,v 1.7.2.2 2001/11/03 00:21:34 gson Exp $
  */
 
 #ifndef _RESOLV_H_
@@ -178,7 +178,8 @@ struct __res_state {
        int     _vcsock;                /* PRIVATE: for res_send VC i/o */
        u_int   _flags;                 /* PRIVATE: see below */
        union {
-               char    pad[52];        /* On an i386 this means 512b total. */
+               /* On an 32-bit arch this means 512b total. */
+               char    pad[72 - 3*sizeof (int) - 2*sizeof (void *)];
                struct {
                        u_int16_t               nscount;
                        u_int16_t               nstimes[MAXNS]; /* ms. */