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

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

diff --git a/CHANGES b/CHANGES
index 1fac7270c2d679857cc69015478acf576dbf0fbc..d0ec47116e294c568f2af2b033bdd297d2b72e3f 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 653d8c35988281e126cdf439f9b42eb791ce9f95..4f1db0f3c5a13bc577e05c23b9c5903fc2688f45 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.207 2005/08/25 00:40:49 marka Exp $ */
+/* $Id: dig.c,v 1.208 2005/10/14 01:14:06 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 6988feaaa8c65e107374616c9311adf0b021190f..b71dd680f5cd72cc88b9b1cd2ac27468f1d5ae54 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.287 2005/09/18 07:16:18 marka Exp $ */
+/* $Id: dighost.c,v 1.288 2005/10/14 01:14:06 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 e01c31de541fc7e3488d3b1b5d7fe5932a3ade2a..116c510d5b50c9df0dc3aba3b01d925b2e05abd5 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.191 2005/09/18 07:16:19 marka Exp $ */
+/* $Id: dnssec-signzone.c,v 1.192 2005/10/14 01:14:06 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 adce9985c8c9fb1392d6f20dde453eb7069619e5..9a723416721ed5749b9f50cb8cad4d52392b8745 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.120 2005/09/05 00:10:53 marka Exp $ */
+/* $Id: xfrout.c,v 1.121 2005/10/14 01:14:07 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 c41de8093357863a3286f777f279ea31c4887861..aec488c8282420fd97cf5ead6c935b2811e915fc 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.394 $)
+AC_REVISION($Revision: 1.395 $)
 
 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 1e79edeb8468e6094e8c1a43a892b00ae0be435e..dab6824cc437c6addcfb8a7128575429820ab4a7 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 b80239b0380d5eec1f5a94cec87213b1bd23a957..860bdfc4e0454e040c8b3eb2b05a7f60d87ea1d2 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.113 $)
+AC_REVISION($Revision: 1.114 $)
 
 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"