2002 [bug] libbind: tighten the constraints on when

                        struct addrinfo._ai_pad exists.  [RT #15783]

diff --git a/CHANGES b/CHANGES
index bc272240fe312cbe2e735a2f6b3adf6c9d78690b..fe72035bbc406e7cce9b646ede1c9e91a04b313f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2002   [bug]           libbind: tighten the constraints on when
+                       struct addrinfo._ai_pad exists.  [RT #15783]
+
 2001.  [func]          Check the KSK flag when updating a secure dynamic zone.
                        New zone option "update-check-ksk yes;".  [RT #15817]
 

diff --git a/lib/bind/include/netdb.h b/lib/bind/include/netdb.h
index fee6102716ffd9c15dd0089c29a7b901cc5722d1..a498d4b091d0f2b89fda01eb295364af27def940 100644 (file)
--- a/lib/bind/include/netdb.h
+++ b/lib/bind/include/netdb.h
@@ -86,7 +86,7 @@
 
 /*
  *      @(#)netdb.h    8.1 (Berkeley) 6/2/93
- *     $Id: netdb.h,v 1.15.18.2 2005/04/27 05:00:49 sra Exp $
+ *     $Id: netdb.h,v 1.15.18.3 2006/03/06 02:27:15 marka Exp $
  */
 
 #ifndef _NETDB_H_
@@ -175,7 +175,7 @@ struct      addrinfo {
        int             ai_socktype;    /*%< SOCK_xxx */
        int             ai_protocol;    /*%< 0 or IPPROTO_xxx for IPv4 and IPv6 */
 #if defined(sun) && defined(_SOCKLEN_T)
-#ifdef __sparc9
+#ifdef __sparcv9
        int             _ai_pad;
 #endif
        socklen_t       ai_addrlen;

diff --git a/lib/bind/irs/getaddrinfo.c b/lib/bind/irs/getaddrinfo.c
index fe04f0903a970d394bbe4765138605aa2ef250b4..a1ea15d6843b93786746162c0ab031f8dbf49668 100644 (file)
--- a/lib/bind/irs/getaddrinfo.c
+++ b/lib/bind/irs/getaddrinfo.c
@@ -336,7 +336,7 @@ getaddrinfo(hostname, servname, hints, res)
        pai->ai_family = PF_UNSPEC;
        pai->ai_socktype = ANY;
        pai->ai_protocol = ANY;
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
        /*
         * clear _ai_pad to preserve binary
         * compatibility with previously compiled 64-bit
@@ -344,7 +344,7 @@ getaddrinfo(hostname, servname, hints, res)
         * guaranteeing the upper 32-bits are empty.
         */
        pai->_ai_pad = 0;
-#endif /* __sparcv9 */
+#endif
        pai->ai_addrlen = 0;
        pai->ai_canonname = NULL;
        pai->ai_addr = NULL;
@@ -369,7 +369,7 @@ getaddrinfo(hostname, servname, hints, res)
                }
                memcpy(pai, hints, sizeof(*pai));
 
-#ifdef __sparcv9
+#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
                /*
                 * We need to clear _ai_pad to preserve binary
                 * compatibility.  See prior comment.