1930. [port] HPUX: ia64 support. [RT #15473]

1929.   [port]          FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM.

diff --git a/CHANGES b/CHANGES
index be00195ddd334b32f959af9c1e719b9afd6d3717..c53eade54a628c7b65ab6f7d15cad57d60713052 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1930.  [port]          HPUX: ia64 support. [RT #15473]
+
+1929.  [port]          FreeBSD: extend use of PTHREAD_SCOPE_SYSTEM.
+
 1928.  [bug]           Race in rbtdb.c:currentversion(). [RT #15517]
 
 1927.  [bug]           Access to soanode or nsnode in rbtdb violated the

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 8c1515378fbb6fc75eefa968a8bf40c5c1ef6ca1..74f294197dfb97daa37cb24b503088fdd1f02f24 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.186.18.20 2005/08/25 00:43:24 marka Exp $ */
+/* $Id: dig.c,v 1.186.18.21 2005/10/14 01:28:19 marka Exp $ */
 
 /*! \file */
 
@@ -813,7 +813,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
                        break;
                case 'l': /* cl */
                        FULLCHECK("cl");
-                       noclass = !state;
+                       noclass = ISC_TF(!state);
                        break;
                case 'm': /* cmd */
                        FULLCHECK("cmd");
@@ -1074,7 +1074,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
                        break;
                case 't': /* ttlid */
                        FULLCHECK("ttlid");
-                       nottl = !state;
+                       nottl = ISC_TF(!state);
                        break;
                default:
                        goto invalid_option;

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index e7accc1542f04e2a3344bb6b79dadeefc385e4af..fa3377bc4fcad12118e9aacef4c10540a1549247 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.259.18.27 2005/09/18 07:58:04 marka Exp $ */
+/* $Id: dighost.c,v 1.259.18.28 2005/10/14 01:28:19 marka Exp $ */
 
 /*! \file
  *  \note
@@ -2227,7 +2227,7 @@ send_udp(dig_query_t *query) {
  */
 static void
 connect_timeout(isc_task_t *task, isc_event_t *event) {
-       dig_lookup_t *l = NULL, *n;
+       dig_lookup_t *l = NULL;
        dig_query_t *query = NULL, *cq;
 
        UNUSED(task);
@@ -2263,7 +2263,7 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
                        debug("making new TCP request, %d tries left",
                              l->retries);
                        l->retries--;
-                       n = requeue_lookup(l, ISC_TRUE);
+                       requeue_lookup(l, ISC_TRUE);
                        cancel_lookup(l);
                        check_next_lookup(l);
                }

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index 0e23d575f498482de60942e5927466c2e44e04f4..2043f7a002f23e125f3fa6bd2a8c0eadbd866df3 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -16,7 +16,7 @@
  * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.177.18.13 2005/09/18 07:58:05 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.177.18.14 2005/10/14 01:28:20 marka Exp $ */
 
 /*! \file */
 
@@ -766,7 +766,6 @@ signname(dns_dbnode_t *node, dns_name_t *name) {
        dns_rdatasetiter_t *rdsiter;
        isc_boolean_t isdelegation = ISC_FALSE;
        isc_boolean_t hasds = ISC_FALSE;
-       isc_boolean_t atorigin;
        isc_boolean_t changed = ISC_FALSE;
        dns_diff_t del, add;
        char namestr[DNS_NAME_FORMATSIZE];
@@ -774,8 +773,6 @@ signname(dns_dbnode_t *node, dns_name_t *name) {
 
        dns_name_format(name, namestr, sizeof(namestr));
 
-       atorigin = dns_name_equal(name, gorigin);
-
        /*
         * Determine if this is a delegation point.
         */
@@ -1432,7 +1429,6 @@ warnifallksk(dns_db_t *db) {
        dns_dbnode_t *node = NULL;
        dns_rdataset_t rdataset;
        dns_rdata_t rdata = DNS_RDATA_INIT;
-       dst_key_t *pubkey;
        isc_result_t result;
        dns_rdata_key_t key;
        isc_boolean_t have_non_ksk = ISC_FALSE;
@@ -1453,7 +1449,6 @@ warnifallksk(dns_db_t *db) {
        result = dns_rdataset_first(&rdataset);
        check_result(result, "dns_rdataset_first");
        while (result == ISC_R_SUCCESS) {
-               pubkey = NULL;
                dns_rdata_reset(&rdata);
                dns_rdataset_current(&rdataset, &rdata);
                result = dns_rdata_tostruct(&rdata, &key, NULL);

diff --git a/bin/named/xfrout.c b/bin/named/xfrout.c
index 77aa7b3dd08a2a6241720ca497c06d46c2f8b217..6870fb24106921f5be3a5e16a1fd236df5a36bf5 100644 (file)
--- a/bin/named/xfrout.c
+++ b/bin/named/xfrout.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrout.c,v 1.115.18.5 2005/09/05 00:18:12 marka Exp $ */
+/* $Id: xfrout.c,v 1.115.18.6 2005/10/14 01:28:21 marka Exp $ */
 
 #include <config.h>
 
@@ -873,7 +873,7 @@ xfrout_log1(ns_client_t *client, dns_name_t *zonename,
            const char *fmt, ...) ISC_FORMAT_PRINTF(5, 6);
 
 static void
-xfrout_log(xfrout_ctx_t *xfr, unsigned int level, const char *fmt, ...)
+xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...)
           ISC_FORMAT_PRINTF(3, 4);
 
 /**************************************************************************/
@@ -1801,7 +1801,7 @@ xfrout_log1(ns_client_t *client, dns_name_t *zonename,
  * Logging function for use when there is a xfrout_ctx_t.
  */
 static void
-xfrout_log(xfrout_ctx_t *xfr, unsigned int level, const char *fmt, ...) {
+xfrout_log(xfrout_ctx_t *xfr, int level, const char *fmt, ...) {
        va_list ap;
        va_start(ap, fmt);
        xfrout_logv(xfr->client, xfr->qname, xfr->qclass, level, fmt, ap);

diff --git a/configure.in b/configure.in
index 91b44f8de3589b8eeee8d47049948f55cb05da59..86b4fb47c66fd13e730ff4f8444840f72cece2a3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
 esyscmd([sed "s/^/# /" COPYRIGHT])dnl
 AC_DIVERT_POP()dnl
 
-AC_REVISION($Revision: 1.355.18.39 $)
+AC_REVISION($Revision: 1.355.18.40 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.59)
@@ -649,7 +649,11 @@ then
                *-freebsd*)
                        AC_CHECK_LIB(c_r, sigwait, AC_DEFINE(HAVE_SIGWAIT),)
                        case $host in
-                       *-freebsd5.3|*-freebsd5.3.*)
+                       *-freebsd5.[[012]]|*-freebsd5.[[012]].*);;
+                       *-freebsd5.[[3456789]]|*-freebsd5.[[3456789]].*)
+                               AC_DEFINE(NEED_PTHREAD_SCOPE_SYSTEM)
+                               ;;
+                       *-freebsd6.*)
                                AC_DEFINE(NEED_PTHREAD_SCOPE_SYSTEM)
                                ;;
                        esac
@@ -819,7 +823,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530"
+                       STD_CWARNINGS="+w1 +W 474,530,2193,2236"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"

diff --git a/lib/bind/configure b/lib/bind/configure
index 41716cbfb56dd64de00b3e8784657daf349830ea..fd444a86dc1835c8ceedb756b8a502640db73be4 100644 (file)
--- a/lib/bind/configure
+++ b/lib/bind/configure
@@ -6423,7 +6423,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530,2193"
+                       STD_CWARNINGS="+w1 +W 474,530,2193,2236"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 66dc894106155acc027b9e0eef4614bb0cd559e9..3fa75c8472f60a5346ad91b03b53a6cc1f24f710 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.19 $)
+AC_REVISION($Revision: 1.90.18.20 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -533,7 +533,7 @@ else
                        ;;
                *)
                        # Turn off the pointlessly noisy warnings.
-                       STD_CWARNINGS="+w1 +W 474,530,2193"
+                       STD_CWARNINGS="+w1 +W 474,530,2193,2236"
                        ;;
                esac
                CCOPT="$CCOPT -Ae -z"