1924. [port] libbind: hpux ia64 support. [RT #15473]

diff --git a/CHANGES b/CHANGES
index 39b5745409bd59f519873d199d5499581c492b3f..0503f4874578c658b65729dbe547a11a40b1d754 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1924.  [port]          libbind: hpux ia64 support. [RT #15473]
+
 1923.  [bug]           ns_client_detach() called too early. [RT #15499]
 
 1922.  [bug]           check-tool.c:setup_logging() missing call to

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index ded66326900e29dbaa4f064444d66e59942ceb40..66dc894106155acc027b9e0eef4614bb0cd559e9 100644 (file)
--- a/lib/bind/configure.in
+++ b/lib/bind/configure.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-AC_REVISION($Revision: 1.90.18.18 $)
+AC_REVISION($Revision: 1.90.18.19 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -430,7 +430,12 @@ then
        DO_PTHREADS="#define DO_PTHREADS 1"
        WANT_IRS_THREADSGR_OBJS="\${WANT_IRS_THREADSGR_OBJS}"
        WANT_IRS_THREADSPW_OBJS="\${WANT_IRS_THREADSPW_OBJS}"
-       WANT_IRS_THREADS_OBJS="\${WANT_IRS_THREADS_OBJS}"
+       case $host in
+       ia64-hp-hpux11.*)
+               WANT_IRS_THREADS_OBJS="";;
+       *)
+               WANT_IRS_THREADS_OBJS="\${WANT_IRS_THREADS_OBJS}";;
+       esac
        WANT_THREADS_OBJS="\${WANT_THREADS_OBJS}"
        thread_dir=pthreads
 else
@@ -528,7 +533,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530"
+                       STD_CWARNINGS="+w1 +W 474,530,2193"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"
@@ -589,6 +594,10 @@ AC_CHECK_FUNC(catgets, AC_DEFINE(HAVE_CATGETS),)
 case "$host" in
        mips-sgi-irix*)
                ;;
+       ia64-hp-hpux11.*)
+               AC_CHECK_LIB(socket, socket)
+               AC_CHECK_LIB(nsl, inet_ntoa)
+               ;;
        *)
                AC_CHECK_LIB(d4r, gethostbyname_r)
                AC_CHECK_LIB(socket, socket)
@@ -1310,6 +1319,10 @@ AC_SUBST(GETGROUPLIST_ARGS)
 
 AC_CHECK_FUNC(setgroupent,,AC_DEFINE(NEED_SETGROUPENT))
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(getnetbyaddr_r,
 AC_TRY_COMPILE(
 [
@@ -1433,6 +1446,8 @@ NET_R_RETURN="#define NET_R_RETURN struct netent *"
 GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T long"
 NETENT_DATA="#undef NETENT_DATA"
 )
+esac
+
 case "$host" in
 *dec-osf*) GETNETBYADDR_ADDR_T="#define GETNETBYADDR_ADDR_T int" ;;
 esac
@@ -1481,6 +1496,11 @@ AC_SUBST(NET_R_ENT_ARGS)
 AC_SUBST(NET_R_SET_RESULT)
 AC_SUBST(NET_R_SET_RETURN)
 
+
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(endnetent_r,
 AC_TRY_COMPILE(
 [
@@ -1525,6 +1545,7 @@ NET_R_END_RETURN="#define NET_R_END_RETURN void"
 NET_R_END_RESULT="#define NET_R_END_RESULT(x) /*empty*/"
 NET_R_END_RETURN="#define NET_R_END_RETURN void"
 )
+esac
 AC_SUBST(NET_R_END_RESULT)
 AC_SUBST(NET_R_END_RETURN)
 
@@ -1577,6 +1598,10 @@ AC_SUBST(GROUP_R_SET_RESULT)
 AC_SUBST(GROUP_R_SET_RETURN)
 
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(gethostbyname_r,
 AC_TRY_COMPILE(
 [
@@ -1649,6 +1674,7 @@ HOST_R_RETURN="#define HOST_R_RETURN struct hostent *"
 HOST_R_SETANSWER="#undef HOST_R_SETANSWER"
 HOSTENT_DATA="#undef HOSTENT_DATA"
 )
+esac
 AC_SUBST(HOST_R_ARGS)
 AC_SUBST(HOST_R_BAD)
 AC_SUBST(HOST_R_COPY)
@@ -1659,6 +1685,10 @@ AC_SUBST(HOST_R_RETURN)
 AC_SUBST(HOST_R_SETANSWER)
 AC_SUBST(HOSTENT_DATA)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(endhostent_r,
 AC_TRY_COMPILE([
 #undef _REENTRANT
@@ -1704,10 +1734,15 @@ HOST_R_END_RESULT="#define HOST_R_END_RESULT(x) /*empty*/"
 HOST_R_END_RETURN="#define HOST_R_END_RETURN void"
 HOST_R_ENT_ARGS="#undef HOST_R_ENT_ARGS /*empty*/"
 )
+esac;
 AC_SUBST(HOST_R_END_RESULT)
 AC_SUBST(HOST_R_END_RETURN)
 AC_SUBST(HOST_R_ENT_ARGS)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(sethostent_r,
 AC_TRY_COMPILE([
 #undef _REENTRANT
@@ -1743,6 +1778,7 @@ HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"],
 HOST_R_SET_RESULT="#undef HOST_R_SET_RESULT"
 HOST_R_SET_RETURN="#define HOST_R_SET_RETURN void"
 )
+esac
 AC_SUBST(HOST_R_SET_RESULT)
 AC_SUBST(HOST_R_SET_RETURN)
 
@@ -1784,6 +1820,10 @@ SETGRENT_VOID="#undef SETGRENT_VOID"
 )
 AC_SUBST(SETGRENT_VOID)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(getnetgrent_r,
 AC_TRY_COMPILE(
 [
@@ -1851,6 +1891,7 @@ NGR_R_COPY_ARGS="#define NGR_R_COPY_ARGS NGR_R_ARGS"
 NGR_R_OK="#define NGR_R_OK 1"
 NGR_R_RETURN="#define NGR_R_RETURN int"
 )
+esac
 AC_SUBST(NGR_R_ARGS)
 AC_SUBST(NGR_R_BAD)
 AC_SUBST(NGR_R_COPY)
@@ -1895,6 +1936,10 @@ AC_SUBST(NGR_R_SET_RETURN)
 
 AC_CHECK_FUNC(innetgr_r,,AC_DEFINE(NEED_INNETGR_R))
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(getprotoent_r,
 AC_TRY_COMPILE(
 [
@@ -1949,6 +1994,7 @@ PROTO_R_OK="#define PROTO_R_OK pptr"
 PROTO_R_SETANSWER="#undef PROTO_R_SETANSWER"
 PROTO_R_RETURN="#define PROTO_R_RETURN struct protoent *"
 )
+esac
 AC_SUBST(PROTO_R_ARGS)
 AC_SUBST(PROTO_R_BAD)
 AC_SUBST(PROTO_R_COPY)
@@ -1957,6 +2003,10 @@ AC_SUBST(PROTO_R_OK)
 AC_SUBST(PROTO_R_SETANSWER)
 AC_SUBST(PROTO_R_RETURN)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(endprotoent_r,
 AC_TRY_COMPILE(
 [
@@ -1980,10 +2030,15 @@ PROTO_R_END_RESULT="#define PROTO_R_END_RESULT(x) /*empty*/"
 PROTO_R_END_RETURN="#define PROTO_R_END_RETURN void"
 PROTO_R_ENT_ARGS="#undef PROTO_R_ENT_ARGS /*empty*/"
 )
+esac
 AC_SUBST(PROTO_R_END_RESULT)
 AC_SUBST(PROTO_R_END_RETURN)
 AC_SUBST(PROTO_R_ENT_ARGS)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(setprotoent_r,
 AC_TRY_COMPILE(
 [
@@ -2002,6 +2057,7 @@ PROTO_R_SET_RETURN="#define PROTO_R_SET_RETURN void"
 PROTO_R_SET_RESULT="#undef PROTO_R_SET_RESULT"
 PROTO_R_SET_RETURN="#define PROTO_R_SET_RETURN void"
 )
+esac
 AC_SUBST(PROTO_R_SET_RESULT)
 AC_SUBST(PROTO_R_SET_RETURN)
 
@@ -2091,6 +2147,10 @@ AC_SUBST(PASS_R_SET_RETURN)
 AC_CHECK_FUNC(getpwnam_r,,AC_DEFINE(NEED_GETPWNAM_R))
 AC_CHECK_FUNC(getpwuid_r,,AC_DEFINE(NEED_GETPWUID_R))
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(getservent_r,
 AC_TRY_COMPILE([
 #undef __USE_MISC
@@ -2137,6 +2197,7 @@ SERV_R_OK="#define SERV_R_OK sptr"
 SERV_R_SETANSWER="#undef SERV_R_SETANSWER"
 SERV_R_RETURN="#define SERV_R_RETURN struct servent *"
 )
+esac
 AC_SUBST(SERV_R_ARGS)
 AC_SUBST(SERV_R_BAD)
 AC_SUBST(SERV_R_COPY)
@@ -2145,6 +2206,10 @@ AC_SUBST(SERV_R_OK)
 AC_SUBST(SERV_R_SETANSWER)
 AC_SUBST(SERV_R_RETURN)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(endservent_r,
 AC_TRY_COMPILE(
 [
@@ -2169,10 +2234,15 @@ SERV_R_END_RESULT="#define SERV_R_END_RESULT(x) /*empty*/"
 SERV_R_END_RETURN="#define SERV_R_END_RETURN void "
 SERV_R_ENT_ARGS="#undef SERV_R_ENT_ARGS /*empty*/"
 )
+esac
 AC_SUBST(SERV_R_END_RESULT)
 AC_SUBST(SERV_R_END_RETURN)
 AC_SUBST(SERV_R_ENT_ARGS)
 
+case $host in
+ia64-hp-hpux11.*)
+;;
+*)
 AC_CHECK_FUNC(setservent_r,
 AC_TRY_COMPILE(
 [
@@ -2194,6 +2264,7 @@ SERV_R_SET_RETURN="#define SERV_R_SET_RETURN void"
 SERV_R_SET_RESULT="#undef SERV_R_SET_RESULT"
 SERV_R_SET_RETURN="#define SERV_R_SET_RETURN void"
 )
+esac
 AC_SUBST(SERV_R_SET_RESULT)
 AC_SUBST(SERV_R_SET_RETURN)
 

diff --git a/lib/bind/dst/dst_api.c b/lib/bind/dst/dst_api.c
index 595202576613f44bd18ac898fde528795540e5fb..4391dd8c05db635eb767747d1663c919de93f24b 100644 (file)
--- a/lib/bind/dst/dst_api.c
+++ b/lib/bind/dst/dst_api.c
@@ -1,5 +1,5 @@
 #ifndef LINT
-static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.10.332.3 2005/07/28 07:38:05 marka Exp $";
+static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.10.332.4 2005/10/11 00:25:08 marka Exp $";
 #endif
 
 /*
@@ -947,7 +947,6 @@ dst_generate_key(const char *name, const int bits, const int exp,
                 const int flags, const int protocol, const int alg)
 {
        DST_KEY *new_key = NULL;
-       int res;
        int dnslen;
        u_char dns[2048];
 
@@ -969,7 +968,7 @@ dst_generate_key(const char *name, const int bits, const int exp,
                         alg));
                return (dst_free_key(new_key));
        }
-       if ((res = new_key->dk_func->generate(new_key, exp)) <= 0) {
+       if (new_key->dk_func->generate(new_key, exp) <= 0) {
                EREPORT(("dst_generate_key_pair(): Key generation failure %s %d %d %d\n",
                         new_key->dk_key_name, new_key->dk_alg,
                         new_key->dk_key_size, exp));

diff --git a/lib/bind/dst/support.c b/lib/bind/dst/support.c
index cc0f68689f08424668328284157af9e1c1e024bc..d674c7e8bd5f43f09664b334bfc53528a587ef6f 100644 (file)
--- a/lib/bind/dst/support.c
+++ b/lib/bind/dst/support.c
@@ -1,4 +1,4 @@
-static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/support.c,v 1.3.332.2 2005/07/28 07:38:06 marka Exp $";
+static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/support.c,v 1.3.332.3 2005/10/11 00:25:09 marka Exp $";
 
 
 /*
@@ -102,7 +102,7 @@ dst_s_id_calc(const u_char *key, const int keysize)
        int size = keysize;
 
        if (!key || (keysize <= 0))
-               return (-1);
+               return (0xffffU);
  
        for (ac = 0; size > 1; size -= 2, kp += 2)
                ac += ((*kp) << 8) + *(kp + 1);

diff --git a/lib/bind/irs/dns_ho.c b/lib/bind/irs/dns_ho.c
index 1ee8807e6617a7b8f0f685c514ff935322979c7d..676973d848edc3d517e2223bde20473a905868e2 100644 (file)
--- a/lib/bind/irs/dns_ho.c
+++ b/lib/bind/irs/dns_ho.c
@@ -52,7 +52,7 @@
 /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_ho.c,v 1.14.18.3 2005/04/27 05:00:55 sra Exp $";
+static const char rcsid[] = "$Id: dns_ho.c,v 1.14.18.4 2005/10/11 00:25:09 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -684,7 +684,7 @@ gethostans(struct irs_ho *this,
 {
        struct pvt *pvt = (struct pvt *)this->private;
        int type, class, ancount, qdcount, n, haveanswer, had_error;
-       int error = NETDB_SUCCESS, arcount;
+       int error = NETDB_SUCCESS;
        int (*name_ok)(const char *);
        const HEADER *hp;
        const u_char *eom;
@@ -731,7 +731,6 @@ gethostans(struct irs_ho *this,
        hp = (const HEADER *)ansbuf;
        ancount = ntohs(hp->ancount);
        qdcount = ntohs(hp->qdcount);
-       arcount = ntohs(hp->arcount);
        bp = pvt->hostbuf;
        ep = pvt->hostbuf + sizeof(pvt->hostbuf);
        cp = ansbuf + HFIXEDSZ;

diff --git a/lib/bind/isc/memcluster.c b/lib/bind/isc/memcluster.c
index 1a9c1ae8d16f30b65b6f38ef75aba006303ca012..5eb5e3989f6ff10d58ce32ca627693472c3e1486 100644 (file)
--- a/lib/bind/isc/memcluster.c
+++ b/lib/bind/isc/memcluster.c
@@ -24,7 +24,7 @@
 
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: memcluster.c,v 1.5.18.4 2005/08/22 01:34:11 marka Exp $";
+static const char rcsid[] = "$Id: memcluster.c,v 1.5.18.5 2005/10/11 00:25:10 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -108,8 +108,10 @@ static unsigned int        memlock = 0;
 
 static size_t                  max_size;
 static size_t                  mem_target;
+#ifndef MEMCLUSTER_BIG_MALLOC
 static size_t                  mem_target_half;
 static size_t                  mem_target_fudge;
+#endif
 static memcluster_element **   freelists;
 #ifdef MEMCLUSTER_RECORD
 static memcluster_element **   activelists;
@@ -146,8 +148,10 @@ meminit(size_t init_max_size, size_t target_size) {
                mem_target = DEF_MEM_TARGET;
        else
                mem_target = target_size;
+#ifndef MEMCLUSTER_BIG_MALLOC
        mem_target_half = mem_target / 2;
        mem_target_fudge = mem_target + mem_target / 4;
+#endif
        freelists = malloc(max_size * sizeof (memcluster_element *));
        stats = malloc((max_size+1) * sizeof (struct stats));
        if (freelists == NULL || stats == NULL) {

diff --git a/lib/bind/nameser/ns_parse.c b/lib/bind/nameser/ns_parse.c
index a986b678f6b09a6505b7c67dd9eb2419bdc32949..5e7998d6c81cf29315effa3302ca05c4e52e88b4 100644 (file)
--- a/lib/bind/nameser/ns_parse.c
+++ b/lib/bind/nameser/ns_parse.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.2 2005/08/12 01:36:03 marka Exp $";
+static const char rcsid[] = "$Id: ns_parse.c,v 1.5.18.3 2005/10/11 00:25:10 marka Exp $";
 #endif
 
 /* Import. */
@@ -140,7 +140,8 @@ ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
        int tmp;
 
        /* Make section right. */
-       if ((tmp = section) < 0 || section >= ns_s_max)
+       tmp = section;
+       if (tmp < 0 || section >= ns_s_max)
                RETERR(ENODEV);
        if (section != handle->_sect)
                setsection(handle, section);

diff --git a/lib/bind/nameser/ns_verify.c b/lib/bind/nameser/ns_verify.c
index faf179727389ac079ad77af849e7705c9890389a..d39fbd9a6e7ee2714aa3fdebf5001cbdb5fe1604 100644 (file)
--- a/lib/bind/nameser/ns_verify.c
+++ b/lib/bind/nameser/ns_verify.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_verify.c,v 1.2.18.1 2005/04/27 05:01:09 sra Exp $";
+static const char rcsid[] = "$Id: ns_verify.c,v 1.2.18.2 2005/10/11 00:25:11 marka Exp $";
 #endif
 
 /* Import. */
@@ -145,7 +145,7 @@ ns_verify(u_char *msg, int *msglen, void *k,
        int n;
        int error;
        u_int16_t type, length;
-       u_int16_t fudge, sigfieldlen, id, otherfieldlen;
+       u_int16_t fudge, sigfieldlen, otherfieldlen;
 
        dst_init();
        if (msg == NULL || msglen == NULL || *msglen < 0)
@@ -199,9 +199,9 @@ ns_verify(u_char *msg, int *msglen, void *k,
        sigstart = cp;
        cp += sigfieldlen;
 
-       /* Read the original id and error. */
+       /* Skip id and read error. */
        BOUNDS_CHECK(cp, 2*INT16SZ);
-       GETSHORT(id, cp);
+       cp += INT16SZ;
        GETSHORT(error, cp);
 
        /* Parse the other data. */
@@ -342,12 +342,12 @@ ns_verify_tcp(u_char *msg, int *msglen, ns_tcp_tsig_state *state,
              int required)
 {
        HEADER *hp = (HEADER *)msg;
-       u_char *recstart, *rdatastart, *sigstart;
+       u_char *recstart, *sigstart;
        unsigned int sigfieldlen, otherfieldlen;
        u_char *cp, *eom = msg + *msglen, *cp2;
        char name[MAXDNAME], alg[MAXDNAME];
        u_char buf[MAXDNAME];
-       int n, type, length, fudge, id, error;
+       int n, type, length, fudge, error;
        time_t timesigned;
 
        if (msg == NULL || msglen == NULL || state == NULL)
@@ -404,7 +404,6 @@ ns_verify_tcp(u_char *msg, int *msglen, ns_tcp_tsig_state *state,
                return (NS_TSIG_ERROR_FORMERR);
 
        /* Read the algorithm name. */
-       rdatastart = cp;
        n = dn_expand(msg, eom, cp, alg, MAXDNAME);
        if (n < 0)
                return (NS_TSIG_ERROR_FORMERR);
@@ -430,9 +429,9 @@ ns_verify_tcp(u_char *msg, int *msglen, ns_tcp_tsig_state *state,
        sigstart = cp;
        cp += sigfieldlen;
 
-       /* Read the original id and error. */
+       /* Skip id and read error. */
        BOUNDS_CHECK(cp, 2*INT16SZ);
-       GETSHORT(id, cp);
+       cp += INT16SZ;
        GETSHORT(error, cp);
 
        /* Parse the other data. */

diff --git a/lib/bind/port_after.h.in b/lib/bind/port_after.h.in
index 5571c7f01f0b7effd207a56f8789805771b9e826..0c956b71ed0ed9f97b537113cee182a0788f2397 100644 (file)
--- a/lib/bind/port_after.h.in
+++ b/lib/bind/port_after.h.in
@@ -32,7 +32,7 @@
 @USE_IFNAMELINKID@
 @PORT_NONBLOCK@
 
-/*! \brief
+/*
  * We need to know the IPv6 address family number even on IPv4-only systems.
  * Note that this is NOT a protocol constant, and that if the system has its
  * own AF_INET6, different from ours below, all of BIND's libraries and
@@ -70,17 +70,18 @@ struct in6_addr {
 /* Replace with structure from later rev of O/S if known. */
 struct sockaddr_in6 {
 #ifdef  HAVE_SA_LEN
-        u_int8_t        sin6_len;       /*!< \brief length of this struct */
-        u_int8_t        sin6_family;    /*!< \brief AF_INET6 */
+        u_int8_t        sin6_len;       /* length of this struct */
+        u_int8_t        sin6_family;    /* AF_INET6 */
 #else
-        u_int16_t       sin6_family;    /*!< \brief AF_INET6 */
+        u_int16_t       sin6_family;    /* AF_INET6 */
 #endif
-        u_int16_t       sin6_port;      /*!< \brief transport layer port # */
-        u_int32_t       sin6_flowinfo;  /*!< \brief IPv6 flow information */
-        struct in6_addr sin6_addr;      /*!< \brief IPv6 address */
-        u_int32_t       sin6_scope_id;  /*!< \brief set of interfaces for a scope */
+        u_int16_t       sin6_port;      /* transport layer port # */
+        u_int32_t       sin6_flowinfo;  /* IPv6 flow information */
+        struct in6_addr sin6_addr;      /* IPv6 address */
+        u_int32_t       sin6_scope_id;  /* set of interfaces for a scope */
 };
 #endif  /* HAS_INET6_STRUCTS */
+
 #ifdef BROKEN_IN6ADDR_INIT_MACROS
 #undef IN6ADDR_ANY_INIT
 #undef IN6ADDR_LOOPBACK_INIT
@@ -129,13 +130,13 @@ struct sockaddr_in6 {
 
 struct sockaddr_storage {
 #ifdef  HAVE_SA_LEN
-        u_int8_t        ss_len;       /*!< \brief address length */
-        u_int8_t        ss_family;    /*!< \brief address family */
+        u_int8_t        ss_len;       /* address length */
+        u_int8_t        ss_family;    /* address family */
         char            __ss_pad1[__SS_ALLIGSIZE - 2 * sizeof(u_int8_t)];
         long            __ss_align;
         char            __ss_pad2[__SS_MAXSIZE - 2 * __SS_ALLIGSIZE];
 #else   
-        u_int16_t       ss_family;    /*!< \brief address family */
+        u_int16_t       ss_family;    /* address family */
         char            __ss_pad1[__SS_ALLIGSIZE - sizeof(u_int16_t)];
         long            __ss_align;
         char            __ss_pad2[__SS_MAXSIZE - 2 * __SS_ALLIGSIZE];
@@ -149,7 +150,7 @@ struct sockaddr_storage {
 extern const struct in6_addr in6addr_any;
 #endif
 
-/*! \brief
+/*
  * IN6_ARE_ADDR_EQUAL, IN6_IS_ADDR_UNSPECIFIED, IN6_IS_ADDR_V4COMPAT and
  * IN6_IS_ADDR_V4MAPPED are broken in glibc 2.1.
  */
@@ -298,7 +299,7 @@ GROUP_R_SET_RETURN setgrent_r(GROUP_R_ENT_ARGS);
 GROUP_R_END_RETURN endgrent_r(GROUP_R_ENT_ARGS);
 #endif
 
-#ifdef NEED_INNETGR_R
+#if defined(NEED_INNETGR_R) && defined(NGR_R_RETURN)
 NGR_R_RETURN
 innetgr_r(const char *, const char *, const char *, const char *);
 #endif
@@ -381,7 +382,9 @@ int isc__gettimeofday(struct timeval *tp, struct timezone *tzp);
 
 int getnetgrent(char **machinep, char **userp, char **domainp);
 
+#ifdef NGR_R_ARGS
 int getnetgrent_r(char **machinep, char **userp, char **domainp, NGR_R_ARGS);
+#endif
 
 #ifdef SETNETGRENT_ARGS
 void setnetgrent(SETNETGRENT_ARGS);
@@ -406,5 +409,3 @@ NGR_R_SET_RETURN
 setnetgrent_r(const char *netgroup);
 #endif
 #endif
-
-/*! \file */

diff --git a/lib/bind/resolv/res_findzonecut.c b/lib/bind/resolv/res_findzonecut.c
index 51b29aa398dbf41a6bc27b20c6e2fe67183fdcfd..207d66c6d55c69be955c57c0350573305187e4ea 100644 (file)
--- a/lib/bind/resolv/res_findzonecut.c
+++ b/lib/bind/resolv/res_findzonecut.c
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_findzonecut.c,v 1.7.18.2 2005/04/27 05:01:10 sra Exp $";
+static const char rcsid[] = "$Id: res_findzonecut.c,v 1.7.18.3 2005/10/11 00:25:11 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -320,7 +320,6 @@ get_soa(res_state statp, const char *dname, ns_class class, int opts,
                for (i = 0; i < n; i++) {
                        const char *t;
                        const u_char *rdata;
-                       int rdlen;
                        ns_rr rr;
 
                        if (ns_parserr(&msg, sect, i, &rr) < 0) {
@@ -369,7 +368,6 @@ get_soa(res_state statp, const char *dname, ns_class class, int opts,
                        }
                        strcpy(zname, t);
                        rdata = ns_rr_rdata(rr);
-                       rdlen = ns_rr_rdlen(rr);
                        if (ns_name_uncompress(resp, ns_msg_end(msg), rdata,
                                               mname, msize) < 0) {
                                DPRINTF(("get_soa: ns_name_uncompress failed")
@@ -527,7 +525,6 @@ save_ns(res_state statp, ns_msg *msg, ns_sect sect,
                const u_char *rdata;
                rr_ns *nsrr;
                ns_rr rr;
-               int rdlen;
 
                if (ns_parserr(msg, sect, i, &rr) < 0) {
                        DPRINTF(("save_ns: ns_parserr(%s, %d) failed",
@@ -546,7 +543,6 @@ save_ns(res_state statp, ns_msg *msg, ns_sect sect,
                                return (-1);
                        }
                        rdata = ns_rr_rdata(rr);
-                       rdlen = ns_rr_rdlen(rr);
                        if (ns_name_uncompress(ns_msg_base(*msg),
                                               ns_msg_end(*msg), rdata,
                                               tname, sizeof tname) < 0) {

diff --git a/lib/bind/resolv/res_mkupdate.c b/lib/bind/resolv/res_mkupdate.c
index 9e7c63886571d86b10d9a7e6986cbf92d584be66..06bc3520908ab8248da228477053267275eeed57 100644 (file)
--- a/lib/bind/resolv/res_mkupdate.c
+++ b/lib/bind/resolv/res_mkupdate.c
@@ -22,7 +22,7 @@
  */
 
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_mkupdate.c,v 1.4.18.2 2005/04/27 05:01:11 sra Exp $";
+static const char rcsid[] = "$Id: res_mkupdate.c,v 1.4.18.3 2005/10/11 00:25:12 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -81,7 +81,7 @@ int
 res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
        ns_updrec *rrecp_start = rrecp_in;
        HEADER *hp;
-       u_char *cp, *sp1, *sp2, *startp, *endp;
+       u_char *cp, *sp2, *startp, *endp;
        int n, i, soanum, multiline;
        ns_updrec *rrecp;
        struct in_addr ina;
@@ -104,7 +104,6 @@ res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
        hp->id = htons(++statp->id);
        hp->opcode = ns_o_update;
        hp->rcode = NOERROR;
-       sp1 = buf + 2*INT16SZ;  /*%< save pointer to zocount */
        cp = buf + HFIXEDSZ;
        buflen -= HFIXEDSZ;
        dpp = dnptrs;