From 70df4b9f067bcce38e0589d10329022c542f053f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Sat, 28 Aug 2004 23:49:45 +0000
Subject: [PATCH 01/40] newcopyrights

---
 util/copyrights | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util/copyrights b/util/copyrights
index 5947defc81..5ab70ae3ef 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -2258,6 +2258,8 @@
 ./lib/lwres/man/lwres_resutil.docbook		SGML	2001,2004
 ./lib/lwres/man/lwres_resutil.html		HTML	2001,2004
 ./lib/lwres/man/resolver.5			MAN	2000,2001,2004
+./lib/lwres/print.c				C	2004
+./lib/lwres/print_p.h				C	2004
 ./lib/lwres/unix/.cvsignore			X	2001
 ./lib/lwres/unix/Makefile.in			MAKE	2001,2004
 ./lib/lwres/unix/include/.cvsignore		X	2001

From 794b06660baff2e96867c5216e28235d320ba2cd Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Sun, 29 Aug 2004 11:05:59 +0000
Subject: [PATCH 02/40] use isc/print.c dates for lwres/print.c use isc/print.h
 dates for lwres/print_p.c

---
 util/copyrights | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/util/copyrights b/util/copyrights
index 5ab70ae3ef..f755e1bf21 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -2258,8 +2258,8 @@
 ./lib/lwres/man/lwres_resutil.docbook		SGML	2001,2004
 ./lib/lwres/man/lwres_resutil.html		HTML	2001,2004
 ./lib/lwres/man/resolver.5			MAN	2000,2001,2004
-./lib/lwres/print.c				C	2004
-./lib/lwres/print_p.h				C	2004
+./lib/lwres/print.c				C	1999,2000,2001,2003,2004
+./lib/lwres/print_p.h				C	1999,2000,2001,2003,2004
 ./lib/lwres/unix/.cvsignore			X	2001
 ./lib/lwres/unix/Makefile.in			MAKE	2001,2004
 ./lib/lwres/unix/include/.cvsignore		X	2001

From 74e0971044bfdee8a3a01c3e014d691cd4837cb6 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 30 Aug 2004 00:54:45 +0000
Subject: [PATCH 03/40] copyright

---
 bin/dig/nslookup.docbook | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index 87dd8bcc31..2767266331 100644
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -1,7 +1,6 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 <!--
  - Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- - Copyright (C) 2000-2002  Internet Software Consortium.
  -
  - Permission to use, copy, modify, and distribute this software for any
  - purpose with or without fee is hereby granted, provided that the above
@@ -16,7 +15,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: nslookup.docbook,v 1.4 2004/08/20 00:54:29 marka Exp $ -->
+<!-- $Id: nslookup.docbook,v 1.5 2004/08/30 00:54:45 marka Exp $ -->
 
 <!--
  - Copyright (c) 1985, 1989

From fa901545edc8bb62969121e14199d533a40d0b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tatuya=20JINMEI=20=E7=A5=9E=E6=98=8E=E9=81=94=E5=93=89?=
 <jinmei@isc.org>
Date: Tue, 31 Aug 2004 08:06:08 +0000
Subject: [PATCH 04/40] 1708.	[placeholder]	rt12376

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 28517e8a7e..0f9f93e7a8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1708.	[placeholder]	rt12376
+
 1707.	[contrib]	sdb/ldap updated to version 1.0-beta.
 
 1706.	[bug]		'rndc stop' failed to cause zones to be flushed

From 119056cca4d28c1b430074076d905dd5c06ddbb2 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 1 Sep 2004 02:04:50 +0000
Subject: [PATCH 05/40] 1682.   [bug]           gethostby*_r() implementations
 that copied the return                         pointer got NULL returned on
 success.

---
 lib/bind/irs/gethostent_r.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/bind/irs/gethostent_r.c b/lib/bind/irs/gethostent_r.c
index 20abe59395..26be3e8360 100644
--- a/lib/bind/irs/gethostent_r.c
+++ b/lib/bind/irs/gethostent_r.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: gethostent_r.c,v 1.6 2004/04/22 03:32:33 marka Exp $";
+static const char rcsid[] = "$Id: gethostent_r.c,v 1.7 2004/09/01 02:04:50 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <port_before.h>
@@ -47,7 +47,7 @@ gethostbyname_r(const char *name,  struct hostent *hptr, HOST_R_ARGS) {
 	HOST_R_ERRNO;
 
 #ifdef HOST_R_SETANSWER
-	if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) == 0)
+	if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) != 0)
 		*answerp = NULL;
 	else
 		*answerp = hptr;
@@ -72,7 +72,7 @@ gethostbyaddr_r(const char *addr, int len, int type,
 	HOST_R_ERRNO;
 
 #ifdef HOST_R_SETANSWER
-	if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) == 0)
+	if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) != 0)
 		*answerp = NULL;
 	else
 		*answerp = hptr;
@@ -102,7 +102,7 @@ gethostent_r(struct hostent *hptr, HOST_R_ARGS) {
 	HOST_R_ERRNO;
 
 #ifdef HOST_R_SETANSWER
-	if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) == 0)
+	if (he == NULL || (n = copy_hostent(he, hptr, HOST_R_COPY)) != 0)
 		*answerp = NULL;
 	else
 		*answerp = hptr;

From 0150a81aad24b795a85236ff7875415291ebbd9f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 1 Sep 2004 04:25:20 +0000
Subject: [PATCH 06/40] match startrecv() prototype to function.

---
 lib/dns/dispatch.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c
index 7ff8d51286..ecf5bd4a7c 100644
--- a/lib/dns/dispatch.c
+++ b/lib/dns/dispatch.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dispatch.c,v 1.119 2004/08/15 04:37:38 jinmei Exp $ */
+/* $Id: dispatch.c,v 1.120 2004/09/01 04:25:20 marka Exp $ */
 
 #include <config.h>
 
@@ -155,7 +155,7 @@ static isc_boolean_t destroy_disp_ok(dns_dispatch_t *);
 static void destroy_disp(isc_task_t *task, isc_event_t *event);
 static void udp_recv(isc_task_t *, isc_event_t *);
 static void tcp_recv(isc_task_t *, isc_event_t *);
-static inline void startrecv(dns_dispatch_t *);
+static void startrecv(dns_dispatch_t *);
 static dns_messageid_t dns_randomid(dns_qid_t *);
 static isc_uint32_t dns_hash(dns_qid_t *, isc_sockaddr_t *, dns_messageid_t);
 static void free_buffer(dns_dispatch_t *disp, void *buf, unsigned int len);

From 3dd9bafd2e3329496c28864f0eb25b85de5854c5 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 1 Sep 2004 04:38:43 +0000
Subject: [PATCH 07/40] fix typo in unexecuted code

---
 lib/isc/win32/socket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/isc/win32/socket.c b/lib/isc/win32/socket.c
index af18e1117e..8a6073259c 100644
--- a/lib/isc/win32/socket.c
+++ b/lib/isc/win32/socket.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: socket.c,v 1.34 2004/06/30 23:35:17 marka Exp $ */
+/* $Id: socket.c,v 1.35 2004/09/01 04:38:43 marka Exp $ */
 
 /* This code has been rewritten to take advantage of Windows Sockets
  * I/O Completion Ports and Events. I/O Completion Ports is ONLY
@@ -1918,7 +1918,7 @@ isc_socket_create(isc_socketmgr_t *manager, int pf, isc_sockettype_t type,
 		if ((pf == AF_INET6)
 		    && (setsockopt(sock->fd, IPPROTO_IPV6, IPV6_PKTINFO,
 				   (void *)&on, sizeof(on)) < 0)) {
-			isc__strerror(WSAGetLaastError(), strbuf, sizeof(strbuf));
+			isc__strerror(WSAGetLastError(), strbuf, sizeof(strbuf));
 			UNEXPECTED_ERROR(__FILE__, __LINE__,
 					 "setsockopt(%d, IPV6_PKTINFO) %s: %s",
 					 sock->fd,

From a90cf89180ae8d9dfd281288cdc75940e46bfdd0 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 1 Sep 2004 05:06:06 +0000
Subject: [PATCH 08/40] placeholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 0f9f93e7a8..21d71395e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1709.	[placeholder]	rt12404
+
 1708.	[placeholder]	rt12376
 
 1707.	[contrib]	sdb/ldap updated to version 1.0-beta.

From d6fe7ba94969ee51a3f4298a735fbc6e11691ad8 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 1 Sep 2004 05:13:06 +0000
Subject: [PATCH 09/40] 1708.   [cleanup]       Replaced dns_fullname_hash()
 with dns_name_fullhash()                         for conformance to the name
 space convention.  Binary                         backward compatibility to
 the old function name is                         provided. [RT #12376]

---
 CHANGES                    |  5 ++++-
 lib/dns/adb.c              |  4 ++--
 lib/dns/include/dns/name.h |  4 ++--
 lib/dns/name.c             | 19 +++++++++++++++++--
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 21d71395e1..1d401b1873 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 1709.	[placeholder]	rt12404
 
-1708.	[placeholder]	rt12376
+1708.	[cleanup]	Replaced dns_fullname_hash() with dns_name_fullhash()
+			for conformance to the name space convention.  Binary
+			backward compatibility to the old function name is
+			provided. [RT #12376]
 
 1707.	[contrib]	sdb/ldap updated to version 1.0-beta.
 
diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 8ae10e0350..8e41c96af9 100644
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.216 2004/06/18 01:22:32 marka Exp $ */
+/* $Id: adb.c,v 1.217 2004/09/01 05:13:04 marka Exp $ */
 
 /*
  * Implementation notes
@@ -1581,7 +1581,7 @@ find_name_and_lock(dns_adb_t *adb, dns_name_t *name,
 	dns_adbname_t *adbname;
 	int bucket;
 
-	bucket = dns_fullname_hash(name, ISC_FALSE) % NBUCKETS;
+	bucket = dns_name_fullhash(name, ISC_FALSE) % NBUCKETS;
 
 	if (*bucketp == DNS_ADB_INVALIDBUCKET) {
 		LOCK(&adb->namelocks[bucket]);
diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 111dde573a..6f976ce7f4 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.109 2004/08/10 00:35:01 marka Exp $ */
+/* $Id: name.h,v 1.110 2004/09/01 05:13:06 marka Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
@@ -312,7 +312,7 @@ dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive);
  */
 
 unsigned int
-dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive);
+dns_name_fullhash(dns_name_t *name, isc_boolean_t case_sensitive);
 /*
  * Provide a hash value for 'name'.  Unlike dns_name_hash(), this function
  * always takes into account of the entire name to calculate the hash value.
diff --git a/lib/dns/name.c b/lib/dns/name.c
index 9e76f6c3b0..27110a93ed 100644
--- a/lib/dns/name.c
+++ b/lib/dns/name.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.c,v 1.145 2004/04/19 21:47:43 marka Exp $ */
+/* $Id: name.c,v 1.146 2004/09/01 05:13:05 marka Exp $ */
 
 #include <config.h>
 
@@ -179,6 +179,9 @@ static dns_name_t wild =
 /* XXXDCL make const? */
 LIBDNS_EXTERNAL_DATA dns_name_t *dns_wildcardname = &wild;
 
+unsigned int
+dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive);
+
 static void
 set_offsets(const dns_name_t *name, unsigned char *offsets,
 	    dns_name_t *set_name);
@@ -430,7 +433,7 @@ dns_name_hash(dns_name_t *name, isc_boolean_t case_sensitive) {
 }
 
 unsigned int
-dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive) {
+dns_name_fullhash(dns_name_t *name, isc_boolean_t case_sensitive) {
 	/*
 	 * Provide a hash value for 'name'.
 	 */
@@ -443,6 +446,18 @@ dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive) {
 			      name->length, case_sensitive));
 }
 
+unsigned int
+dns_fullname_hash(dns_name_t *name, isc_boolean_t case_sensitive) {
+	/*
+	 * This function was deprecated due to the breakage of the name space
+	 * convention.  We only keep this internally to provide binary backward
+	 * compatibility.
+	 */
+	REQUIRE(VALID_NAME(name));
+
+	return (dns_name_fullhash(name, case_sensitive));
+}
+
 unsigned int
 dns_name_hashbylabel(dns_name_t *name, isc_boolean_t case_sensitive) {
 	unsigned char *offsets;

From 23ac30603a7639bea1d331537634b079b046b122 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 1 Sep 2004 07:25:51 +0000
Subject: [PATCH 10/40] 1709.   [port]          solaris: add SMF support from
 Sun.

---
 CHANGES          |   2 +-
 bin/named/main.c |  95 +++++++++++++++++++++++++++++++-
 config.h.in      |   5 +-
 configure        | 138 ++++++++++++++++++++++++++++++++++++-----------
 configure.in     |   7 ++-
 5 files changed, 213 insertions(+), 34 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1d401b1873..1128b09778 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-1709.	[placeholder]	rt12404
+1709.	[port]		solaris: add SMF support from Sun.
 
 1708.	[cleanup]	Replaced dns_fullname_hash() with dns_name_fullhash()
 			for conformance to the name space convention.  Binary
diff --git a/bin/named/main.c b/bin/named/main.c
index 8bf038da81..4e04511877 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: main.c,v 1.138 2004/07/01 02:03:54 marka Exp $ */
+/* $Id: main.c,v 1.139 2004/09/01 07:23:51 marka Exp $ */
 
 #include <config.h>
 
@@ -47,6 +47,10 @@
 
 #include <dst/result.h>
 
+#ifdef HAVE_LIBSCF
+#include <libscf.h>
+#endif
+
 /*
  * Defining NS_MAIN provides storage declarations (rather than extern)
  * for variables in named/globals.h.
@@ -684,6 +688,91 @@ ns_main_setmemstats(const char *filename) {
 		strcpy(memstats, filename);
 }
 
+#ifdef HAVE_LIBSCF
+/*
+ * Get FMRI for the current named process
+ */
+static char *
+scf_get_ins_name(void) {
+	scf_handle_t *h = NULL;
+	int namelen;
+	char *ins_name;
+
+	if ((h = scf_handle_create(SCF_VERSION)) == NULL) {
+		UNEXPECTED_ERROR(__FILE__, __LINE__,
+				 "scf_handle_create() failed: %s",
+				 scf_strerror(scf_error()));
+		return (NULL);
+	}
+
+	if (scf_handle_bind(h) == -1) {
+		UNEXPECTED_ERROR(__FILE__, __LINE__,
+				 "scf_handle_bind() failed: %s",
+				 scf_strerror(scf_error()));
+		scf_handle_destroy(h);
+		return (NULL);
+	}
+
+	if ((namelen = scf_myname(h, NULL, 0)) == -1) {
+		isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+			      NS_LOGMODULE_MAIN, ISC_LOG_INFO,
+			      "scf_myname() failed: %s",
+			      scf_strerror(scf_error()));
+		scf_handle_destroy(h);
+		return (NULL);
+	}
+
+	if ((ins_name = malloc(namelen + 1)) == NULL) {
+		UNEXPECTED_ERROR(__FILE__, __LINE__,
+				 "scf_get_ins_named() memory "
+				 "allocation failed: %s",
+				 isc_result_totext(ISC_R_NOMEMORY));
+		scf_handle_destroy(h);
+		return (NULL);
+	}
+
+	if (scf_myname(h, ins_name, namelen + 1) == -1) {
+		UNEXPECTED_ERROR(__FILE__, __LINE__,
+				 "scf_myname() failed: %s",
+				 scf_strerror(scf_error()));
+		scf_handle_destroy(h);
+		free(ins_name);
+		return (NULL);
+	}
+
+	scf_handle_destroy(h);
+	isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL, NS_LOGMODULE_MAIN,
+		      ISC_LOG_INFO, "instance name:%s", ins_name);
+
+	return (ins_name);
+}
+
+static void
+scf_cleanup(void) {
+	char *s;
+	char *ins_name;
+
+	if ((ins_name = scf_get_ins_name()) != NULL) {
+		if ((s = smf_get_state(ins_name)) != NULL) {
+			if ((strcmp(SCF_STATE_STRING_ONLINE, s) == 0) ||
+			    (strcmp(SCF_STATE_STRING_DEGRADED, s) == 0)) {
+				if (smf_disable_instance(ins_name, 0) != 0) {
+				    UNEXPECTED_ERROR(__FILE__, __LINE__,
+					"smf_disable_instance() failed: %s",
+					scf_strerror(scf_error()));
+				}
+			}
+			free(s);
+		} else {
+			UNEXPECTED_ERROR(__FILE__, __LINE__,
+					 "smf_get_state() failed: %s",
+					 scf_strerror(scf_error()));
+		}
+		free(ins_name);
+	}
+}
+#endif
+
 int
 main(int argc, char *argv[]) {
 	isc_result_t result;
@@ -762,6 +851,10 @@ main(int argc, char *argv[]) {
 		}
 	} while (result != ISC_R_SUCCESS);
 
+#ifdef HAVE_LIBSCF
+	scf_cleanup();
+#endif
+
 	cleanup();
 
 	if (want_stats) {
diff --git a/config.h.in b/config.h.in
index a80f06c6ff..4bc0c9fe2e 100644
--- a/config.h.in
+++ b/config.h.in
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.in,v 1.61 2004/05/21 08:15:36 marka Exp $ */
+/* $Id: config.h.in,v 1.62 2004/09/01 07:25:51 marka Exp $ */
 
 /***
  *** This file is not to be included by any public header files, because
@@ -161,6 +161,9 @@ int sigwait(const unsigned int *set, int *sig);
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 
+/* Define to 1 if you have the `scf' library (-lscf). */
+#undef HAVE_LIBSCF
+
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
diff --git a/configure b/configure
index 7e10b4d1e6..c969f373aa 100755
--- a/configure
+++ b/configure
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-# $Id: configure,v 1.345 2004/08/28 06:20:13 marka Exp $
+# $Id: configure,v 1.347 2004/09/24 04:37:18 marka Exp $
 #
 # Portions Copyright (C) 1996-2001  Nominum, Inc.
 #
@@ -29,7 +29,7 @@
 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
 # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# From configure.in Revision: 1.361 .
+# From configure.in Revision: 1.362 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -6632,6 +6632,84 @@ fi
 ISC_THREAD_DIR=$thread_dir
 
 
+#
+# In solaris 10, SMF can manage named service
+#
+
+echo "$as_me:$LINENO: checking for smf_enable_instance in -lscf" >&5
+echo $ECHO_N "checking for smf_enable_instance in -lscf... $ECHO_C" >&6
+if test "${ac_cv_lib_scf_smf_enable_instance+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lscf  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char smf_enable_instance ();
+int
+main ()
+{
+smf_enable_instance ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_scf_smf_enable_instance=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_scf_smf_enable_instance=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_scf_smf_enable_instance" >&5
+echo "${ECHO_T}$ac_cv_lib_scf_smf_enable_instance" >&6
+if test $ac_cv_lib_scf_smf_enable_instance = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSCF 1
+_ACEOF
+
+  LIBS="-lscf $LIBS"
+
+fi
+
+
 #
 # flockfile is usually provided by pthreads, but we may want to use it
 # even if compiled with --disable-threads.  getc_unlocked might also not
@@ -7842,7 +7920,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7845 "configure"' > conftest.$ac_ext
+  echo '#line 7923 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8832,7 +8910,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:8835:" \
+echo "$as_me:8913:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -9870,11 +9948,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9873: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9951: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9877: \$? = $ac_status" >&5
+   echo "$as_me:9955: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10103,11 +10181,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10106: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10184: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10110: \$? = $ac_status" >&5
+   echo "$as_me:10188: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10163,11 +10241,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10166: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10244: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10170: \$? = $ac_status" >&5
+   echo "$as_me:10248: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12347,7 +12425,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12350 "configure"
+#line 12428 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12445,7 +12523,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12448 "configure"
+#line 12526 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14628,11 +14706,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14631: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14709: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14635: \$? = $ac_status" >&5
+   echo "$as_me:14713: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -14688,11 +14766,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14691: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14769: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14695: \$? = $ac_status" >&5
+   echo "$as_me:14773: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16049,7 +16127,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16052 "configure"
+#line 16130 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16147,7 +16225,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 16150 "configure"
+#line 16228 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16974,11 +17052,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16977: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17055: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16981: \$? = $ac_status" >&5
+   echo "$as_me:17059: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17034,11 +17112,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17037: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17115: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17041: \$? = $ac_status" >&5
+   echo "$as_me:17119: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19072,11 +19150,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19075: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19153: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19079: \$? = $ac_status" >&5
+   echo "$as_me:19157: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19305,11 +19383,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19308: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19386: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19312: \$? = $ac_status" >&5
+   echo "$as_me:19390: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -19365,11 +19443,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19368: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19446: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19372: \$? = $ac_status" >&5
+   echo "$as_me:19450: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21549,7 +21627,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21552 "configure"
+#line 21630 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21647,7 +21725,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21650 "configure"
+#line 21728 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/configure.in b/configure.in
index dad10a36b5..1dd2ed5c0e 100644
--- 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.361 $)
+AC_REVISION($Revision: 1.362 $)
 
 AC_INIT(lib/dns/name.c)
 AC_PREREQ(2.13)
@@ -856,6 +856,11 @@ AC_SUBST(ISC_PLATFORM_USETHREADS)
 ISC_THREAD_DIR=$thread_dir
 AC_SUBST(ISC_THREAD_DIR)
 
+#
+# In solaris 10, SMF can manage named service
+#
+AC_CHECK_LIB(scf, smf_enable_instance)
+
 #
 # flockfile is usually provided by pthreads, but we may want to use it
 # even if compiled with --disable-threads.  getc_unlocked might also not

From 8147940ae7a7280ba12dd35614b9c987b38363fa Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 3 Sep 2004 01:19:04 +0000
Subject: [PATCH 11/40] placeholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 1128b09778..cfb4d64453 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1710.	[placeholder]	rt9479
+
 1709.	[port]		solaris: add SMF support from Sun.
 
 1708.	[cleanup]	Replaced dns_fullname_hash() with dns_name_fullhash()

From ac86cff0d7ff2108cd7ace66697e2de104735496 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 3 Sep 2004 01:31:44 +0000
Subject: [PATCH 12/40] placeholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index cfb4d64453..a3847ee55c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1711.	[placeholder]	rt12416
+
 1710.	[placeholder]	rt9479
 
 1709.	[port]		solaris: add SMF support from Sun.

From 817a7fb62d05222fb287bbcde910ab3669f6d237 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 3 Sep 2004 03:42:58 +0000
Subject: [PATCH 13/40] 1711.   [func]          'rndc unfreeze' has been
 deprecated by 'rndc thaw'.

---
 CHANGES                           | 2 +-
 bin/named/control.c               | 5 +++--
 bin/named/include/named/control.h | 3 ++-
 bin/rndc/rndc.c                   | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index a3847ee55c..7c856059a6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-1711.	[placeholder]	rt12416
+1711.	[func]		'rndc unfreeze' has been deprecated by 'rndc thaw'.
 
 1710.	[placeholder]	rt9479
 
diff --git a/bin/named/control.c b/bin/named/control.c
index e951238bdd..f61bb957e7 100644
--- a/bin/named/control.c
+++ b/bin/named/control.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.c,v 1.20 2004/03/22 01:46:00 marka Exp $ */
+/* $Id: control.c,v 1.21 2004/09/03 03:42:58 marka Exp $ */
 
 #include <config.h>
 
@@ -122,7 +122,8 @@ ns_control_docommand(isccc_sexpr_t *message, isc_buffer_t *text) {
 		result = ns_server_status(ns_g_server, text);
 	} else if (command_compare(command, NS_COMMAND_FREEZE)) {
 		result = ns_server_freeze(ns_g_server, ISC_TRUE, command);
-	} else if (command_compare(command, NS_COMMAND_UNFREEZE)) {
+	} else if (command_compare(command, NS_COMMAND_UNFREEZE) ||
+		   command_compare(command, NS_COMMAND_THAW)) {
 		result = ns_server_freeze(ns_g_server, ISC_FALSE, command);
 	} else if (command_compare(command, NS_COMMAND_RECURSING)) {
 		result = ns_server_dumprecursing(ns_g_server);
diff --git a/bin/named/include/named/control.h b/bin/named/include/named/control.h
index 7a271d29f0..1c9a813173 100644
--- a/bin/named/include/named/control.h
+++ b/bin/named/include/named/control.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: control.h,v 1.14 2004/03/05 04:57:55 marka Exp $ */
+/* $Id: control.h,v 1.15 2004/09/03 03:42:58 marka Exp $ */
 
 #ifndef NAMED_CONTROL_H
 #define NAMED_CONTROL_H 1
@@ -47,6 +47,7 @@
 #define NS_COMMAND_STATUS	"status"
 #define NS_COMMAND_FREEZE	"freeze"
 #define NS_COMMAND_UNFREEZE	"unfreeze"
+#define NS_COMMAND_THAW		"thaw"
 #define NS_COMMAND_TIMERPOKE	"timerpoke"
 #define NS_COMMAND_RECURSING	"recursing"
 #define NS_COMMAND_NULL		"null"
diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 38f24efa8f..0430148d5c 100644
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rndc.c,v 1.98 2004/07/23 04:15:23 marka Exp $ */
+/* $Id: rndc.c,v 1.99 2004/09/03 03:42:58 marka Exp $ */
 
 /*
  * Principal Author: DCL
@@ -102,7 +102,7 @@ command is one of the following:\n\
 		Retransfer a single zone without checking serial number.\n\
   freeze zone [class [view]]\n\
   		Suspend updates to a dynamic zone.\n\
-  unfreeze zone [class [view]]\n\
+  thaw zone [class [view]]\n\
   		Enable updates to a frozen dynamic zone and reload it.\n\
   reconfig	Reload configuration file and new zones only.\n\
   stats		Write server statistics to the statistics file.\n\

From a4743d3d26c4dde69b80fd69bca83e0c28063425 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 3 Sep 2004 03:55:20 +0000
Subject: [PATCH 14/40] 1712.   [bug]           Missing FULLCHECK for
 "trusted-key" in dig.

---
 CHANGES       | 2 ++
 bin/dig/dig.c | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 7c856059a6..e523548d02 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1712.	[bug]		Missing FULLCHECK for "trusted-key" in dig.
+
 1711.	[func]		'rndc unfreeze' has been deprecated by 'rndc thaw'.
 
 1710.	[placeholder]	rt9479
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 4b02897f41..abf0c085dd 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.194 2004/06/23 04:07:29 marka Exp $ */
+/* $Id: dig.c,v 1.195 2004/09/03 03:55:20 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -1024,6 +1024,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 				break;
 #ifdef DIG_SIGCHASE
 			case 'u': /* trusted-key */
+				FULLCHECK("trusted-key");
 			  	if (value == NULL) 
 					goto need_value;
 				if (!state)

From 4f32995bf6af48ab410b6d14b160348f5ffe0556 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 3 Sep 2004 06:35:06 +0000
Subject: [PATCH 15/40] placeholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index e523548d02..050f313269 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1713.	[placeholder]	rt12375
+
 1712.	[bug]		Missing FULLCHECK for "trusted-key" in dig.
 
 1711.	[func]		'rndc unfreeze' has been deprecated by 'rndc thaw'.

From 3f79a8b6f1b50f8e1bc2f274bcfe91d6af74f161 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 6 Sep 2004 01:24:44 +0000
Subject: [PATCH 16/40] 1714.   [bug]           dig/host/nslookup were only
 trying the first                         address when a nameserver was
 specified by name.                         [RT #12286]

---
 CHANGES                   |  4 +++
 bin/dig/dig.c             | 64 +++++++++++++++++++++++++++------------
 bin/dig/dighost.c         | 49 ++++++++++++++++++++++--------
 bin/dig/host.c            |  4 +--
 bin/dig/include/dig/dig.h |  6 ++--
 bin/dig/nslookup.c        |  8 +++--
 6 files changed, 97 insertions(+), 38 deletions(-)

diff --git a/CHANGES b/CHANGES
index 050f313269..cb0e956e3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1714.	[bug]		dig/host/nslookup were only trying the first
+			address when a nameserver was specified by name.
+			[RT #12286]
+
 1713.	[placeholder]	rt12375
 
 1712.	[bug]		Missing FULLCHECK for "trusted-key" in dig.
diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index abf0c085dd..1803ecf6ab 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.195 2004/09/03 03:55:20 marka Exp $ */
+/* $Id: dig.c,v 1.196 2004/09/06 01:24:42 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -41,6 +41,8 @@
 #include <dns/rdataclass.h>
 #include <dns/result.h>
 
+#include <bind9/getaddresses.h>
+
 #include <dig/dig.h>
 
 extern ISC_LIST(dig_lookup_t) lookup_list;
@@ -54,6 +56,7 @@ extern ISC_LIST(dig_searchlist_t) search_list;
 		isc_buffer_putstr(b, s); 		\
 }
 
+#define DIG_MAX_ADDRESSES 20
 
 extern isc_boolean_t have_ipv4, have_ipv6, specified_source,
 	usesearch, qr;
@@ -83,6 +86,7 @@ extern isc_boolean_t debugging, memdebugging;
 static char *batchname = NULL;
 static FILE *batchfp = NULL;
 static char *argv0;
+static int addresscount = 0;
 
 static char domainopt[DNS_NAME_MAXTEXT];
 
@@ -627,6 +631,15 @@ printgreeting(int argc, char **argv, dig_lookup_t *lookup) {
 		remaining = sizeof(lookup->cmdline) -
 			    strlen(lookup->cmdline) - 1;
 		strncat(lookup->cmdline, "\n", remaining);
+		if (first && addresscount != 0) {
+			snprintf(append, sizeof(append),
+				 "; (%d server%s found)\n",
+				 addresscount,
+				 addresscount > 1 ? "s" : "");
+			strncat(lookup->cmdline, append, remaining);
+			remaining = sizeof(lookup->cmdline) -
+				    strlen(lookup->cmdline) - 1;
+		}
 		if (first) {
 			snprintf(append, sizeof(append), 
 				 ";; global options: %s %s\n",
@@ -1069,8 +1082,7 @@ static const char *single_dash_opts = "46dhimnv";
 static const char *dash_opts = "46bcdfhikmnptvyx";
 static isc_boolean_t
 dash_option(char *option, char *next, dig_lookup_t **lookup,
-	    isc_boolean_t *open_type_class, isc_boolean_t *firstarg,
-	    int argc, char **argv)
+	    isc_boolean_t *open_type_class)
 {
 	char opt, *value, *ptr;
 	isc_result_t result;
@@ -1275,10 +1287,6 @@ dash_option(char *option, char *next, dig_lookup_t **lookup,
 			if (!(*lookup)->rdclassset)
 				(*lookup)->rdclass = dns_rdataclass_in;
 			(*lookup)->new_search = ISC_TRUE;
-			if (*lookup && *firstarg) {
-				printgreeting(argc, argv, *lookup);
-				*firstarg = ISC_FALSE;
-			}
 			ISC_LIST_APPEND(lookup_list, *lookup, link);
 		} else {
 			fprintf(stderr, "Invalid IP address %s\n", value);
@@ -1325,13 +1333,36 @@ preparse_args(int argc, char **argv) {
 	}
 }
 
+static void
+getaddresses(dig_lookup_t *lookup, const char *host) {
+	isc_result_t result;
+	isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
+	isc_netaddr_t netaddr;
+	unsigned int count, i;
+	dig_server_t *srv;
+	char tmp[ISC_NETADDR_FORMATSIZE];
+
+	result = bind9_getaddresses(host, 0, sockaddrs,
+				    DIG_MAX_ADDRESSES, &count);   
+	if (result != ISC_R_SUCCESS)
+	fatal("couldn't get address for '%s': %s",
+	      host, isc_result_totext(result));
+
+	for (i = 0; i < count; i++) {
+		isc_netaddr_fromsockaddr(&netaddr, &sockaddrs[i]);
+		isc_netaddr_format(&netaddr, tmp, sizeof(tmp));
+		srv = make_server(tmp, host);
+		ISC_LIST_APPEND(lookup->my_server_list, srv, link);
+	}
+	addresscount = count;
+}
+
 static void
 parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 	   int argc, char **argv) {
 	isc_result_t result;
 	isc_textregion_t tr;
 	isc_boolean_t firstarg = ISC_TRUE;
-	dig_server_t *srv = NULL;
 	dig_lookup_t *lookup = NULL;
 	dns_rdatatype_t rdtype;
 	dns_rdataclass_t rdclass;
@@ -1411,24 +1442,20 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 		if (strncmp(rv[0], "%", 1) == 0)
 			break;
 		if (strncmp(rv[0], "@", 1) == 0) {
-			srv = make_server(&rv[0][1]);
-			ISC_LIST_APPEND(lookup->my_server_list,
-					srv, link);
+			getaddresses(lookup, &rv[0][1]);
 		} else if (rv[0][0] == '+') {
 			plus_option(&rv[0][1], is_batchfile,
 				    lookup);
 		} else if (rv[0][0] == '-') {
 			if (rc <= 1) {
 				if (dash_option(&rv[0][1], NULL,
-						&lookup, &open_type_class,
-						&firstarg, argc, argv)) {
+						&lookup, &open_type_class)) {
 					rc--;
 					rv++;
 				}
 			} else {
 				if (dash_option(&rv[0][1], rv[1],
-						&lookup, &open_type_class,
-						&firstarg, argc, argv)) {
+						&lookup, &open_type_class)) {
 					rc--;
 					rv++;
 				}
@@ -1499,10 +1526,6 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 			if (!config_only) {
 				lookup = clone_lookup(default_lookup,
 						      ISC_TRUE);
-				if (firstarg) {
-					printgreeting(argc, argv, lookup);
-					firstarg = ISC_FALSE;
-				}
 				strncpy(lookup->textname, rv[0], 
 					sizeof(lookup->textname));
 				lookup->textname[sizeof(lookup->textname)-1]=0;
@@ -1569,6 +1592,9 @@ parse_args(isc_boolean_t is_batchfile, isc_boolean_t config_only,
 			firstarg = ISC_FALSE;
 		}
 		ISC_LIST_APPEND(lookup_list, lookup, link);
+	} else if (!config_only && firstarg) {
+			printgreeting(argc, argv, lookup);
+			firstarg = ISC_FALSE;
 	}
 }
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index b0d322eb3e..5cd9614ba1 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.264 2004/06/30 23:47:48 marka Exp $ */
+/* $Id: dighost.c,v 1.265 2004/09/06 01:24:43 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -290,6 +290,8 @@ struct_tk_list  tk_list = { {NULL, NULL, NULL, NULL, NULL}, 0};
 
 #endif
 
+#define DIG_MAX_ADDRESSES 20
+
 /*
  * Apply and clear locks at the event level in global task.
  * Can I get rid of these using shutdown events?  XXX
@@ -493,7 +495,7 @@ check_result(isc_result_t result, const char *msg) {
  * of finding the answer the user is looking for
  */
 dig_server_t *
-make_server(const char *servname) {
+make_server(const char *servname, const char *userarg) {
 	dig_server_t *srv;
 
 	REQUIRE(servname != NULL);
@@ -504,10 +506,13 @@ make_server(const char *servname) {
 		fatal("memory allocation failure in %s:%d",
 		      __FILE__, __LINE__);
 	strncpy(srv->servername, servname, MXNAME);
+	strncpy(srv->userarg, userarg, MXNAME);
 	srv->servername[MXNAME-1] = 0;
+	srv->userarg[MXNAME-1] = 0;
 	ISC_LINK_INIT(srv, link);
 	return (srv);
 }
+
 static int
 addr2af(int lwresaddrtype)
 {
@@ -525,6 +530,7 @@ addr2af(int lwresaddrtype)
 
 	return (af);
 }
+
 /*
  * Create a copy of the server list from the lwres configuration structure.
  * The dest list must have already had ISC_LIST_INIT applied.
@@ -542,11 +548,12 @@ copy_server_list(lwres_conf_t *confdata, dig_serverlist_t *dest) {
 
 		lwres_net_ntop(af, confdata->nameservers[i].address,
 				   tmp, sizeof(tmp));
-		newsrv = make_server(tmp);
+		newsrv = make_server(tmp, tmp);
 		ISC_LINK_INIT(newsrv, link);
 		ISC_LIST_ENQUEUE(*dest, newsrv, link);
 	}
 }
+
 void
 flush_server_list(void) {
 	dig_server_t *s, *ps;
@@ -560,18 +567,35 @@ flush_server_list(void) {
 		isc_mem_free(mctx, ps);
 	}
 }
+
 void
 set_nameserver(char *opt) {
+	isc_result_t result;
+	isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
+	isc_netaddr_t netaddr;
+	unsigned int count, i;
 	dig_server_t *srv;
+	char tmp[ISC_NETADDR_FORMATSIZE];
 
 	if (opt == NULL)
 		return;
 
+	result = bind9_getaddresses(opt, 0, sockaddrs,
+				    DIG_MAX_ADDRESSES, &count); 
+	if (result != ISC_R_SUCCESS)
+		fatal("couldn't get address for '%s': %s",
+		      opt, isc_result_totext(result));
+
 	flush_server_list();
-	srv = make_server(opt);
-	if (srv == NULL)
-		fatal("memory allocation failure");
-	ISC_LIST_INITANDAPPEND(server_list, srv, link);
+	
+	for (i = 0; i < count; i++) {
+		isc_netaddr_fromsockaddr(&netaddr, &sockaddrs[i]);
+		isc_netaddr_format(&netaddr, tmp, sizeof(tmp));
+		srv = make_server(tmp, opt);
+		if (srv == NULL)
+			fatal("memory allocation failure");
+		ISC_LIST_APPEND(server_list, srv, link);
+	}
 }
 
 static isc_result_t
@@ -613,7 +637,7 @@ clone_server_list(dig_serverlist_t src, dig_serverlist_t *dest) {
 	debug("clone_server_list()");
 	srv = ISC_LIST_HEAD(src);
 	while (srv != NULL) {
-		newsrv = make_server(srv->servername);
+		newsrv = make_server(srv->servername, srv->userarg);
 		ISC_LINK_INIT(newsrv, link);
 		ISC_LIST_ENQUEUE(*dest, newsrv, link);
 		srv = ISC_LIST_NEXT(srv, link);
@@ -1436,7 +1460,7 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section)
 					query->lookup->ns_search_only;
 				lookup->trace_root = ISC_FALSE;
 			}
-			srv = make_server(namestr);
+			srv = make_server(namestr, namestr);
 			debug("adding server %s", srv->servername);
 			ISC_LIST_APPEND(lookup->my_server_list, srv, link);
 			dns_rdata_reset(&rdata);
@@ -1800,6 +1824,7 @@ setup_lookup(dig_lookup_t *lookup) {
 		query->first_rr_serial = 0;
 		query->second_rr_serial = 0;
 		query->servname = serv->servername;
+		query->userarg = serv->userarg;
 		query->rr_count = 0;
 		query->msg_count = 0;
 		ISC_LINK_INIT(query, link);
@@ -3688,7 +3713,7 @@ prepare_lookup(dns_name_t *name)
 				dns_rdata_reset(&aaaa);
 
 
-				srv = make_server(namestr);
+				srv = make_server(namestr, namestr);
 	     
 				ISC_LIST_APPEND(lookup->my_server_list,
 						srv, link);
@@ -3718,7 +3743,7 @@ prepare_lookup(dns_name_t *name)
 				printf("ns name: %s\n", namestr);
       
 
-				srv = make_server(namestr);
+				srv = make_server(namestr, namestr);
 	     
 				ISC_LIST_APPEND(lookup->my_server_list,
 						srv, link);
@@ -3730,7 +3755,7 @@ prepare_lookup(dns_name_t *name)
 		printf("ns name: ");
 		dns_name_print(&ns.name, stdout);
 		printf("\n");
-		srv = make_server(namestr);
+		srv = make_server(namestr, namestr);
 	     
 		ISC_LIST_APPEND(lookup->my_server_list, srv, link);
 
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 24aea48785..5c099e5e92 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.97 2004/04/13 02:54:14 marka Exp $ */
+/* $Id: host.c,v 1.98 2004/09/06 01:24:43 marka Exp $ */
 
 #include <config.h>
 #include <limits.h>
@@ -386,7 +386,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 		char sockstr[ISC_SOCKADDR_FORMATSIZE];
 
 		printf("Using domain server:\n");
-		printf("Name: %s\n", query->servname);
+		printf("Name: %s\n", query->userarg);
 		isc_sockaddr_format(&query->sockaddr, sockstr,
 				    sizeof(sockstr));
 		printf("Address: %s\n", sockstr);
diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h
index 067c08649b..555206c56a 100644
--- a/bin/dig/include/dig/dig.h
+++ b/bin/dig/include/dig/dig.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.h,v 1.85 2004/06/19 02:23:36 sra Exp $ */
+/* $Id: dig.h,v 1.86 2004/09/06 01:24:44 marka Exp $ */
 
 #ifndef DIG_H
 #define DIG_H
@@ -192,6 +192,7 @@ struct dig_query {
 	isc_uint32_t msg_count;
 	isc_uint32_t rr_count;
 	char *servname;
+	char *userarg;
 	isc_bufferlist_t sendlist,
 		recvlist,
 		lengthlist;
@@ -209,6 +210,7 @@ struct dig_query {
 
 struct dig_server {
 	char servername[MXNAME];
+	char userarg[MXNAME];
 	ISC_LINK(dig_server_t) link;
 };
 
@@ -272,7 +274,7 @@ dig_lookup_t *
 clone_lookup(dig_lookup_t *lookold, isc_boolean_t servers);
 
 dig_server_t *
-make_server(const char *servname);
+make_server(const char *servname, const char *userarg);
 
 void
 flush_server_list(void);
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index a5eaff52cd..a70323ab94 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.106 2004/08/19 07:02:42 marka Exp $ */
+/* $Id: nslookup.c,v 1.107 2004/09/06 01:24:43 marka Exp $ */
 
 #include <config.h>
 
@@ -402,7 +402,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 	debug("printmessage()");
 
 	isc_sockaddr_format(&query->sockaddr, servtext, sizeof(servtext));
-	printf("Server:\t\t%s\n", query->servname);
+	printf("Server:\t\t%s\n", query->userarg);
 	printf("Address:\t%s\n", servtext);
 	
 	puts("");
@@ -461,7 +461,7 @@ show_settings(isc_boolean_t full, isc_boolean_t serv_only) {
 		get_address(srv->servername, port, &sockaddr);
 		isc_sockaddr_format(&sockaddr, sockstr, sizeof(sockstr));
 		printf("Default server: %s\nAddress: %s\n",
-			srv->servername, sockstr);
+			srv->userarg, sockstr);
 		if (!full)
 			return;
 		srv = ISC_LIST_NEXT(srv, link);
@@ -738,7 +738,9 @@ get_next_command(void) {
 		setoption(arg);
 	else if ((strcasecmp(ptr, "server") == 0) ||
 		 (strcasecmp(ptr, "lserver") == 0)) {
+		isc_app_block();
 		set_nameserver(arg);
+		isc_app_unblock();
 		show_settings(ISC_TRUE, ISC_TRUE);
 	} else if (strcasecmp(ptr, "exit") == 0) {
 		in_use = ISC_FALSE;

From 41be71bae48846d9525be6f71e19944e34748e26 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 6 Sep 2004 06:21:46 +0000
Subject: [PATCH 17/40] placeholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index cb0e956e3f..2be54dfc0e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1715.	[placeholder]	rt11681
+
 1714.	[bug]		dig/host/nslookup were only trying the first
 			address when a nameserver was specified by name.
 			[RT #12286]

From 9678a61917ad31c3e7ba5dd8e2a48837f50a1b9d Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 6 Sep 2004 06:22:35 +0000
Subject: [PATCH 18/40] indenting

---
 bin/dig/dig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 1803ecf6ab..5afb95f52a 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.196 2004/09/06 01:24:42 marka Exp $ */
+/* $Id: dig.c,v 1.197 2004/09/06 06:22:35 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -1021,7 +1021,7 @@ plus_option(char *option, isc_boolean_t is_batchfile,
 					lookup->stats = ISC_FALSE;
 					lookup->section_additional = ISC_FALSE;
 					lookup->section_authority = ISC_TRUE;
-				lookup->section_question = ISC_FALSE;
+					lookup->section_question = ISC_FALSE;
 				}
 				break;
 			case 'i': /* tries */

From 4ab6d6464f5490a30acf1e292c7f3f26dc99d6db Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 6 Sep 2004 21:53:34 +0000
Subject: [PATCH 19/40] 1716.   [doc]           named.conf(5) was being
 installed in the wrong                         location.  [RT# 12441]

---
 CHANGES               | 3 +++
 bin/named/Makefile.in | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2be54dfc0e..32c7487048 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1716.	[doc]		named.conf(5) was being installed in the wrong
+			location.  [RT# 12441]
+
 1715.	[placeholder]	rt11681
 
 1714.	[bug]		dig/host/nslookup were only trying the first
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 7109995f73..8d38e14137 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.83 2004/08/20 22:01:22 marka Exp $
+# $Id: Makefile.in,v 1.84 2004/09/06 21:53:34 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -123,9 +123,13 @@ clean distclean maintainer-clean::
 
 installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
 install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
 	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
-	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
+	${INSTALL_DATA} ${srcdir}/named.8 ${DESTDIR}${mandir}/man8
+	${INSTALL_DATA} ${srcdir}/lwresd.8 ${DESTDIR}${mandir}/man8
+	${INSTALL_DATA} ${srcdir}/named.conf.5 ${DESTDIR}${mandir}/man5
+

From 756f078904cae6c7932090eadcc95722f14aff07 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 7 Sep 2004 04:14:44 +0000
Subject: [PATCH 20/40] clean up */dsset-*, */dlvset-* and ns2/dlv.db

---
 bin/tests/system/dnssec/clean.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index 5ff2abe958..90e17cbcc5 100644
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -15,13 +15,13 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.15 2004/03/10 01:06:04 marka Exp $
+# $Id: clean.sh,v 1.16 2004/09/07 04:14:44 marka Exp $
 
-rm -f */K* */keyset-* */signedkey-* */*.signed */trusted.conf */tmp*
+rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp*
 rm -f ns1/root.db ns2/example.db ns3/secure.example.db
 rm -f ns3/unsecure.example.db ns3/bogus.example.db ns3/keyless.example.db
 rm -f ns3/dynamic.example.db ns3/dynamic.example.db.signed.jnl
 rm -f */example.bk
 rm -f dig.out.*
 rm -f random.data
-
+rm -f ns2/dlv.db

From a9977c0fda5909d94b32bdbed22d1d1e54a1b41a Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 8 Sep 2004 00:26:14 +0000
Subject: [PATCH 21/40] bad descriptions
 s/dns_label_countlabels/dns_name_countlabels/

---
 lib/dns/include/dns/name.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/dns/include/dns/name.h b/lib/dns/include/dns/name.h
index 6f976ce7f4..ea10296ed6 100644
--- a/lib/dns/include/dns/name.h
+++ b/lib/dns/include/dns/name.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: name.h,v 1.110 2004/09/01 05:13:06 marka Exp $ */
+/* $Id: name.h,v 1.111 2004/09/08 00:26:14 marka Exp $ */
 
 #ifndef DNS_NAME_H
 #define DNS_NAME_H 1
@@ -560,7 +560,7 @@ dns_name_getlabel(const dns_name_t *name, unsigned int n, dns_label_t *label);
  *	be changed while 'label' is still in use.
  *
  * Requires:
- *	n < dns_label_countlabels(name)
+ *	n < dns_name_countlabels(name)
  */
 
 void
@@ -582,9 +582,9 @@ dns_name_getlabelsequence(const dns_name_t *source, unsigned int first,
  * Requires:
  *	'source' and 'target' are valid names.
  *
- *	first < dns_label_countlabels(name)
+ *	first < dns_name_countlabels(name)
  *
- *	first + n <= dns_label_countlabels(name)
+ *	first + n <= dns_name_countlabels(name)
  */
 
 
@@ -601,7 +601,7 @@ dns_name_clone(dns_name_t *source, dns_name_t *target);
  *	This call is functionally equivalent to:
  *
  *		dns_name_getlabelsequence(source, 0,
- *					  dns_label_countlabels(source),
+ *					  dns_name_countlabels(source),
  *					  target);
  *
  *	but is more efficient.  Also, dns_name_clone() works even if 'source'

From 86c3e4bb9663719cfa16e493a145c4ff0d6f745f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 9 Sep 2004 01:02:12 +0000
Subject: [PATCH 22/40] 1717.   [port]          solaris: ifconfig.sh did not
 support Solaris 10.                         "ifconfig.sh down" didn't work
 for Solaris 9.

---
 CHANGES                      | 3 +++
 bin/tests/system/ifconfig.sh | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 32c7487048..0670f266e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1717.	[port]		solaris: ifconfig.sh did not support Solaris 10.
+			"ifconfig.sh down" didn't work for Solaris 9.
+
 1716.	[doc]		named.conf(5) was being installed in the wrong
 			location.  [RT# 12441]
 
diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index 9e3d57a504..13b775975e 100644
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: ifconfig.sh,v 1.46 2004/03/18 02:57:54 marka Exp $
+# $Id: ifconfig.sh,v 1.47 2004/09/09 01:02:12 marka Exp $
 
 #
 # Set up interface aliases for bind9 system tests.
@@ -72,7 +72,7 @@ case "$1" in
 		    *-sun-solaris2.[6-7])
 			ifconfig lo0:$int 10.53.0.$ns netmask 0xffffffff up
 			;;
-		    *-*-solaris2.[8-9])
+		    *-*-solaris2.[8-9]|*-*-solaris2.10)
     			/sbin/ifconfig lo0:$int plumb
 			/sbin/ifconfig lo0:$int 10.53.0.$ns up
 			;;
@@ -132,7 +132,7 @@ case "$1" in
 		    *-sun-solaris2.[6-7])
 			ifconfig lo0:$int 10.53.0.$ns down
 			;;
-		    *-*-solaris2.8)
+		    *-*-solaris2.[8-9]|*-*-solaris2.10)
 			ifconfig lo0:$int 10.53.0.$ns down
 			ifconfig lo0:$int 10.53.0.$ns unplumb
 			;;

From bff602d4acc7e3facc28b8931538b77d53681f15 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 13 Sep 2004 01:18:43 +0000
Subject: [PATCH 23/40] placeholder

---
 CHANGES | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES b/CHANGES
index 0670f266e7..ce0b9c7bf0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+1720.	[placeholder]	rt12505a
+
+1719.	[placeholder]	rt12505a
+
+1718.	[placeholder]	rt12505a
+
 1717.	[port]		solaris: ifconfig.sh did not support Solaris 10.
 			"ifconfig.sh down" didn't work for Solaris 9.
 

From bce2d35b4879d7878e339a9c60db9364508e38fd Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 15 Sep 2004 00:30:26 +0000
Subject: [PATCH 24/40] placeholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index ce0b9c7bf0..54840674ee 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1721.	[placeholder]	rt12519
+
 1720.	[placeholder]	rt12505a
 
 1719.	[placeholder]	rt12505a

From 7a1cba6262f099aa5ecf9ed4db9c0345489653cc Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 15 Sep 2004 04:11:38 +0000
Subject: [PATCH 25/40] placeholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 54840674ee..ac1ff94176 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1722.	[placeholder]	rt12519
+
 1721.	[placeholder]	rt12519
 
 1720.	[placeholder]	rt12505a

From 49954c293ca0e4b4a66fb2e03cd075722c210a1a Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 00:56:12 +0000
Subject: [PATCH 26/40] pullup 1684.   [port]          64 bit size_t issues /
 compiler warnings.

---
 lib/bind/dst/dst_api.c      | 7 ++++---
 lib/bind/irs/dns_nw.c       | 4 ++--
 lib/bind/irs/gen.c          | 8 +++++---
 lib/bind/isc/memcluster.c   | 6 +++---
 lib/bind/nameser/ns_print.c | 4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/bind/dst/dst_api.c b/lib/bind/dst/dst_api.c
index 07bdbb6819..f3588acb69 100644
--- 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 2002/02/20 01:43:59 gson Exp $";
+static const char rcsid[] = "$Header: /u0/home/explorer/proj/ISC/git-conversion/cvsroot/bind9/lib/bind/dst/Attic/dst_api.c,v 1.11 2004/09/16 00:56:12 marka Exp $";
 #endif
 
 /*
@@ -861,7 +861,8 @@ dst_s_read_private_key_file(char *name, DST_KEY *pk_key, u_int16_t in_id,
 	len = cnt;
 	p = in_buff;
 
-	if (!dst_s_verify_str((const char **) &p, "Private-key-format: v")) {
+	if (!dst_s_verify_str((const char **) (void *)&p,
+			       "Private-key-format: v")) {
 		EREPORT(("dst_s_read_private_key_file(): Not a Key file/Decrypt failed %s\n", name));
 		goto fail;
 	}
@@ -879,7 +880,7 @@ dst_s_read_private_key_file(char *name, DST_KEY *pk_key, u_int16_t in_id,
 
 	while (*p++ != '\n') ;	/* skip to end of line */
 
-	if (!dst_s_verify_str((const char **) &p, "Algorithm: "))
+	if (!dst_s_verify_str((const char **) (void *)&p, "Algorithm: "))
 		goto fail;
 
 	if (sscanf((char *)p, "%d", &alg) != 1)
diff --git a/lib/bind/irs/dns_nw.c b/lib/bind/irs/dns_nw.c
index 8368b747f6..8ac89a47c4 100644
--- a/lib/bind/irs/dns_nw.c
+++ b/lib/bind/irs/dns_nw.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: dns_nw.c,v 1.10 2004/05/17 07:52:46 marka Exp $";
+static const char rcsid[] = "$Id: dns_nw.c,v 1.11 2004/09/16 00:56:12 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /* Imports. */
@@ -569,7 +569,7 @@ normalize_name(char *name) {
 	/* Make lower case. */
 	for (t = name; *t; t++)
 		if (isascii((unsigned char)*t) && isupper((unsigned char)*t))
-			*t = tolower(*t);
+			*t = tolower((*t)&0xff);
 
 	/* Remove trailing dots. */
 	while (t > name && t[-1] == '.')
diff --git a/lib/bind/irs/gen.c b/lib/bind/irs/gen.c
index 093ecf361e..ec360df7ae 100644
--- a/lib/bind/irs/gen.c
+++ b/lib/bind/irs/gen.c
@@ -16,7 +16,7 @@
  */
 
 #if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: gen.c,v 1.5 2004/03/18 02:57:58 marka Exp $";
+static const char rcsid[] = "$Id: gen.c,v 1.6 2004/09/16 00:56:12 marka Exp $";
 #endif
 
 /*
@@ -391,8 +391,10 @@ init_map_rules(struct gen_p *irs, const char *conf_file) {
 		default_map_rules(irs);
 		return;
 	}
-	(void) sprintf(pattern, "%%%ds %%%ds %%%ds\n",
-		       sizeof mapname, sizeof accname, sizeof options);
+	(void) sprintf(pattern, "%%%lus %%%lus %%%lus\n",
+		       (unsigned long)sizeof mapname,
+		       (unsigned long)sizeof accname,
+		       (unsigned long)sizeof options);
 	while (fgets(line, sizeof line, conf)) {
 		enum irs_map_id map;
 		enum irs_acc_id acc;
diff --git a/lib/bind/isc/memcluster.c b/lib/bind/isc/memcluster.c
index aa210dd06d..110b904e20 100644
--- 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 2004/03/18 02:58:00 marka Exp $";
+static const char rcsid[] = "$Id: memcluster.c,v 1.6 2004/09/16 00:56:12 marka Exp $";
 #endif /* not lint */
 
 #include "port_before.h"
@@ -471,9 +471,9 @@ memstats(FILE *out) {
 
 		if (s->totalgets == 0U && s->gets == 0U)
 			continue;
-		fprintf(out, "%s%5d: %11lu gets, %11lu rem",
+		fprintf(out, "%s%5lu: %11lu gets, %11lu rem",
 			(i == max_size) ? ">=" : "  ",
-			i, s->totalgets, s->gets);
+			(unsigned long)i, s->totalgets, s->gets);
 		if (s->blocks != 0U)
 			fprintf(out, " (%lu bl, %lu ff)",
 				s->blocks, s->freefrags);
diff --git a/lib/bind/nameser/ns_print.c b/lib/bind/nameser/ns_print.c
index 51592862b8..10a4093299 100644
--- a/lib/bind/nameser/ns_print.c
+++ b/lib/bind/nameser/ns_print.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_print.c,v 1.7 2004/07/28 20:16:49 marka Exp $";
+static const char rcsid[] = "$Id: ns_print.c,v 1.8 2004/09/16 00:56:12 marka Exp $";
 #endif
 
 /* Import. */
@@ -705,7 +705,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
 	int n, m;
 	char *p;
 
-	len = SPRINTF((tmp, "\\# %u%s\t; %s", edata - rdata,
+	len = SPRINTF((tmp, "\\# %u%s\t; %s", (unsigned)(edata - rdata),
 		       rdlen != 0 ? " (" : "", comment));
 	T(addstr(tmp, len, &buf, &buflen));
 	while (rdata < edata) {

From ffcbf9ea917725d49be6b006efa02613de5ef242 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 01:01:27 +0000
Subject: [PATCH 27/40] silence compiler warnings

---
 bin/dig/dig.c               |  4 +--
 bin/dig/dighost.c           |  4 +--
 bin/nsupdate/nsupdate.c     |  6 ++---
 lib/bind9/getaddresses.c    |  4 +--
 lib/dns/rdata/in_1/wks_11.c |  4 +--
 lib/isc/string.c            |  4 +--
 lib/lwres/print.c           | 51 +++++++++++++++++++------------------
 7 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 5afb95f52a..103963c8be 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.197 2004/09/06 06:22:35 marka Exp $ */
+/* $Id: dig.c,v 1.198 2004/09/16 01:01:25 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -1338,7 +1338,7 @@ getaddresses(dig_lookup_t *lookup, const char *host) {
 	isc_result_t result;
 	isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
 	isc_netaddr_t netaddr;
-	unsigned int count, i;
+	int count, i;
 	dig_server_t *srv;
 	char tmp[ISC_NETADDR_FORMATSIZE];
 
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 5cd9614ba1..a1f11a816a 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.265 2004/09/06 01:24:43 marka Exp $ */
+/* $Id: dighost.c,v 1.266 2004/09/16 01:01:25 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -573,7 +573,7 @@ set_nameserver(char *opt) {
 	isc_result_t result;
 	isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];
 	isc_netaddr_t netaddr;
-	unsigned int count, i;
+	int count, i;
 	dig_server_t *srv;
 	char tmp[ISC_NETADDR_FORMATSIZE];
 
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 5e7c13b0c5..dece03d5b3 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.133 2004/06/17 01:03:00 sra Exp $ */
+/* $Id: nsupdate.c,v 1.134 2004/09/16 01:01:26 marka Exp $ */
 
 #include <config.h>
 
@@ -627,7 +627,7 @@ parse_args(int argc, char **argv) {
 				exit(1);
 			}
 			if (timeout == 0)
-				timeout = ULONG_MAX;
+				timeout = UINT_MAX;
 			break;
 		case 'u':
 			result = isc_parse_uint32(&udp_timeout,
@@ -637,7 +637,7 @@ parse_args(int argc, char **argv) {
 				exit(1);
 			}
 			if (udp_timeout == 0)
-				udp_timeout = ULONG_MAX;
+				udp_timeout = UINT_MAX;
 			break;
 		case 'r':
 			result = isc_parse_uint32(&udp_retries,
diff --git a/lib/bind9/getaddresses.c b/lib/bind9/getaddresses.c
index d407f64066..dd35bcebdf 100644
--- a/lib/bind9/getaddresses.c
+++ b/lib/bind9/getaddresses.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: getaddresses.c,v 1.16 2004/05/15 03:37:33 jinmei Exp $ */
+/* $Id: getaddresses.c,v 1.17 2004/09/16 01:01:26 marka Exp $ */
 
 #include <config.h>
 #include <string.h>
@@ -84,7 +84,7 @@ bind9_getaddresses(const char *hostname, in_port_t port,
 			isc_sockaddr_v6fromin(&addrs[0], &in4, port);
 		*addrcount = 1;
 		return (ISC_R_SUCCESS);
-	} else if (strlen(hostname) <= 127) {
+	} else if (strlen(hostname) <= 127U) {
 		char tmpbuf[128], *d;
 		isc_uint32_t zone = 0;
 
diff --git a/lib/dns/rdata/in_1/wks_11.c b/lib/dns/rdata/in_1/wks_11.c
index 00fde6c424..233c4b29ab 100644
--- a/lib/dns/rdata/in_1/wks_11.c
+++ b/lib/dns/rdata/in_1/wks_11.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: wks_11.c,v 1.51 2004/03/05 05:10:25 marka Exp $ */
+/* $Id: wks_11.c,v 1.52 2004/09/16 01:01:26 marka Exp $ */
 
 /* Reviewed: Fri Mar 17 15:01:49 PST 2000 by explorer */
 
@@ -107,7 +107,7 @@ fromtext_in_wks(ARGS_FROMTEXT) {
 		service[sizeof(service)-1] = '\0';
 		for (i = strlen(service) - 1; i >= 0; i--)
 			if (isupper(service[i]&0xff))
-				service[i] = tolower(service[i]);
+				service[i] = tolower(service[i]&0xff);
 
 		port = strtol(DNS_AS_STR(token), &e, 10);
 		if (*e == 0)
diff --git a/lib/isc/string.c b/lib/isc/string.c
index 99a126a1a6..8895a8e143 100644
--- a/lib/isc/string.c
+++ b/lib/isc/string.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: string.c,v 1.10 2004/03/18 02:58:06 marka Exp $ */
+/* $Id: string.c,v 1.11 2004/09/16 01:01:26 marka Exp $ */
 
 #include <config.h>
 
@@ -60,7 +60,7 @@ isc_string_touint64(char *source, char **end, int base) {
 	tmp = 0;
 
 	while ((c = *s) != 0) {
-		c = tolower(c);
+		c = tolower(c&0xff);
 		/* end ? */
 		if ((o = strchr(digits, c)) == NULL) {
 			*end = s;
diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index 8911e004d8..767a65b21c 100644
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -15,12 +15,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.2 2004/08/28 06:20:14 marka Exp $ */
+/* $Id: print.c,v 1.3 2004/09/16 01:01:27 marka Exp $ */
 
 #include <config.h>
 
 #include <ctype.h>
 #include <stdio.h>		/* for sprintf */
+#include <string.h>
 
 #define	LWRES__PRINT_SOURCE	/* Used to get the lwres_print_* prototypes. */
 
@@ -96,7 +97,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 
 	while (*format != '\0') {
 		if (*format != '%') {
-			if (size > 1) {
+			if (size > 1U) {
 				*str++ = *format;
 				size--;
 			}
@@ -170,7 +171,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 		case '\0':
 			continue;
 		case '%':
-			if (size > 1) {
+			if (size > 1U) {
 				*str++ = *format;
 				size--;
 			}
@@ -312,28 +313,28 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 				count += strlen(head) + strlen(buf) + pad +
 					 zeropad;
 				if (!left) {
-					while (pad > 0 && size > 1) {
+					while (pad > 0 && size > 1U) {
 						*str++ = ' ';
 						size--;
 						pad--;
 					}
 				}
 				cp = head;
-				while (*cp != '\0' && size > 1) {
+				while (*cp != '\0' && size > 1U) {
 					*str++ = *cp++;
 					size--;
 				}
-				while (zeropad > 0 && size > 1) {
+				while (zeropad > 0 && size > 1U) {
 					*str++ = '0';
 					size--;
 					zeropad--;
 				}
 				cp = buf;
-				while (*cp != '\0' && size > 1) {
+				while (*cp != '\0' && size > 1U) {
 					*str++ = *cp++;
 					size--;
 				}
-				while (pad > 0 && size > 1) {
+				while (pad > 0 && size > 1U) {
 					*str++ = ' ';
 					size--;
 					pad--;
@@ -369,24 +370,24 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			}
 			count += pad + length;
 			if (!left)
-				while (pad > 0 && size > 1) {
+				while (pad > 0 && size > 1U) {
 					*str++ = ' ';
 					size--;
 					pad--;
 				}
 			if (precision != 0)
 				while (precision > 0 && *cp != '\0' &&
-				       size > 1) {
+				       size > 1U) {
 					*str++ = *cp++;
 					size--;
 					precision--;
 				}
 			else
-				while (*cp != '\0' && size > 1) {
+				while (*cp != '\0' && size > 1U) {
 					*str++ = *cp++;
 					size--;
 				}
-			while (pad > 0 && size > 1) {
+			while (pad > 0 && size > 1U) {
 				*str++ = ' ';
 				size--;
 				pad--;
@@ -401,17 +402,17 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 					*str++ = c;
 					size--;
 				}
-				while (width-- > 0 && size > 1) {
+				while (width-- > 0 && size > 1U) {
 					*str++ = ' ';
 					size--;
 				}
-				if (!left && size > 1) {
+				if (!left && size > 1U) {
 					*str++ = c;
 					size--;
 				}
 			} else {
 				count++;
-				if (size > 1) {
+				if (size > 1U) {
 					*str++ = c;
 					size--;
 				}
@@ -430,7 +431,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			}
 			count += length + pad + zeropad;
 			if (!left)
-				while (pad > 0 && size > 1) {
+				while (pad > 0 && size > 1U) {
 					*str++ = ' ';
 					size--;
 					pad--;
@@ -438,25 +439,25 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			cp = buf;
 			if (zeropad > 0 && buf[0] == '0' &&
 			    (buf[1] == 'x' || buf[1] == 'X')) {
-				if (size > 1) {
+				if (size > 1U) {
 					*str++ = *cp++;
 					size--;
 				}
-				if (size > 1) {
+				if (size > 1U) {
 					*str++ = *cp++;
 					size--;
 				}
-				while (zeropad > 0 && size > 1) {
+				while (zeropad > 0 && size > 1U) {
 					*str++ = '0';
 					size--;
 					zeropad--;
 				}
 			}
-			while (*cp != '\0' && size > 1) {
+			while (*cp != '\0' && size > 1U) {
 				*str++ = *cp++;
 				size--;
 			}
-			while (pad > 0 && size > 1) {
+			while (pad > 0 && size > 1U) {
 				*str++ = ' ';
 				size--;
 				pad--;
@@ -522,17 +523,17 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 				}
 				count += length + pad;
 				if (!left)
-					while (pad > 0 && size > 1) {
+					while (pad > 0 && size > 1U) {
 						*str++ = ' ';
 						size--;
 						pad--;
 					}
 				cp = buf;
-				while (*cp != ' ' && size > 1) {
+				while (*cp != ' ' && size > 1U) {
 					*str++ = *cp++;
 					size--;
 				}
-				while (pad > 0 && size > 1) {
+				while (pad > 0 && size > 1U) {
 					*str++ = ' ';
 					size--;
 					pad--;
@@ -547,7 +548,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 		}
 		format++;
 	}
-	if (size > 0)
+	if (size > 0U)
 		*str = '\0';
 	return (count);
 }

From 51f99a878d7449a4280b2a8db4c84acb3735f259 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 02:10:42 +0000
Subject: [PATCH 28/40] 1720.   [bug]           'dig +chase' did not terminate
 on a RFC 2308 Type 1                         negative response. [RT #12506]

1719.   [bug]           named was not correctly caching a RFC 2308 Type 1
                        negative response. [RT #12506]

1718.   [bug]           nsupdate was not handling RFC 2308 Type 3 negative
                        responses when looking for the zone / master server.
                        [RT #12506]
---
 CHANGES                 | 10 ++++---
 bin/dig/dighost.c       |  9 ++++++-
 bin/nsupdate/nsupdate.c | 59 +++++++++++++++++++++--------------------
 lib/dns/resolver.c      | 54 ++++++++++++++++++++++++++-----------
 4 files changed, 83 insertions(+), 49 deletions(-)

diff --git a/CHANGES b/CHANGES
index ac1ff94176..f6551163ed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,11 +2,15 @@
 
 1721.	[placeholder]	rt12519
 
-1720.	[placeholder]	rt12505a
+1720.	[bug]		'dig +chase' did not terminate on a RFC 2308 Type 1
+			negative response. [RT #12506]
 
-1719.	[placeholder]	rt12505a
+1719.	[bug]		named was not correctly caching a RFC 2308 Type 1
+			negative response. [RT #12506]
 
-1718.	[placeholder]	rt12505a
+1718.	[bug]		nsupdate was not handling RFC 2308 Type 3 negative
+			responses when looking for the zone / master server.
+			[RT #12506]
 
 1717.	[port]		solaris: ifconfig.sh did not support Solaris 10.
 			"ifconfig.sh down" didn't work for Solaris 9.
diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index a1f11a816a..ba80651c53 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.266 2004/09/16 01:01:25 marka Exp $ */
+/* $Id: dighost.c,v 1.267 2004/09/16 02:10:41 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -1416,6 +1416,13 @@ followup_lookup(dns_message_t *msg, dig_query_t *query, dns_section_t section)
 		name = NULL;
 		dns_message_currentname(msg, section, &name);
 
+		if (section == DNS_SECTION_AUTHORITY) {
+			rdataset = NULL;
+			result = dns_message_findtype(name, dns_rdatatype_soa,
+						      0, &rdataset);
+			if (result == ISC_R_SUCCESS)
+				return (0);
+		}
 		rdataset = NULL;
 		result = dns_message_findtype(name, dns_rdatatype_ns, 0,
 					      &rdataset);
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index dece03d5b3..4f6174da22 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.134 2004/09/16 01:01:26 marka Exp $ */
+/* $Id: nsupdate.c,v 1.135 2004/09/16 02:10:42 marka Exp $ */
 
 #include <config.h>
 
@@ -1595,6 +1595,8 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 	dns_message_t *soaquery = NULL;
 	isc_sockaddr_t *addr;
 	isc_boolean_t seencname = ISC_FALSE;
+	dns_name_t tname;
+	unsigned int nlabels;
 
 	UNUSED(task);
 
@@ -1703,9 +1705,8 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 		section = DNS_SECTION_ANSWER;
 	else if (pass == 1)
 		section = DNS_SECTION_AUTHORITY;
-	else
-		fatal("response to SOA query didn't contain an SOA");
-
+	else 
+		goto droplabel;
 
 	result = dns_message_firstname(rcvmsg, section);
 	if (result != ISC_R_SUCCESS) {
@@ -1742,29 +1743,8 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 		goto lookforsoa;
 	}
 
-	if (seencname) {
-		dns_name_t tname;
-		unsigned int nlabels;
-
-		result = dns_message_firstname(soaquery, DNS_SECTION_QUESTION);
-		INSIST(result == ISC_R_SUCCESS);
-		name = NULL;
-		dns_message_currentname(soaquery, DNS_SECTION_QUESTION, &name);
-		nlabels = dns_name_countlabels(name);
-		if (nlabels == 1)
-			fatal("could not find enclosing zone");
-		dns_name_init(&tname, NULL);
-		dns_name_getlabelsequence(name, 1, nlabels - 1, &tname);
-		dns_name_clone(&tname, name);
-		dns_request_destroy(&request);
-		dns_message_renderreset(soaquery);
-		if (userserver != NULL)
-			sendrequest(localaddr, userserver, soaquery, &request);
-		else
-			sendrequest(localaddr, &servers[ns_inuse], soaquery,
-				    &request);
-		goto out;
-	}
+	if (seencname)
+		goto droplabel;
 
 	if (debugging) {
 		char namestr[DNS_NAME_FORMATSIZE];
@@ -1807,17 +1787,38 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
 		get_address(serverstr, DNSDEFAULTPORT, &tempaddr);
 		serveraddr = &tempaddr;
 	}
+	dns_rdata_freestruct(&soa);
 
 	send_update(zonename, serveraddr, localaddr);
+	setzoneclass(dns_rdataclass_none);
 
 	dns_message_destroy(&soaquery);
 	dns_request_destroy(&request);
 
  out:
-	setzoneclass(dns_rdataclass_none);
-	dns_rdata_freestruct(&soa);
 	dns_message_destroy(&rcvmsg);
 	ddebug("Out of recvsoa");
+	return;
+ 
+ droplabel:
+	result = dns_message_firstname(soaquery, DNS_SECTION_QUESTION);
+	INSIST(result == ISC_R_SUCCESS);
+	name = NULL;
+	dns_message_currentname(soaquery, DNS_SECTION_QUESTION, &name);
+	nlabels = dns_name_countlabels(name);
+	if (nlabels == 1)
+		fatal("could not find enclosing zone");
+	dns_name_init(&tname, NULL);
+	dns_name_getlabelsequence(name, 1, nlabels - 1, &tname);
+	dns_name_clone(&tname, name);
+	dns_request_destroy(&request);
+	dns_message_renderreset(soaquery);
+	if (userserver != NULL)
+		sendrequest(localaddr, userserver, soaquery, &request);
+	else
+		sendrequest(localaddr, &servers[ns_inuse], soaquery,
+			    &request);
+	goto out;
 }
 
 static void
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index dc5aa2b9d0..88bec26536 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.294 2004/08/28 06:16:56 marka Exp $ */
+/* $Id: resolver.c,v 1.295 2004/09/16 02:10:42 marka Exp $ */
 
 #include <config.h>
 
@@ -4127,7 +4127,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
 		dns_message_currentname(message, section, &name);
 		if (dns_name_issubdomain(name, &fctx->domain)) {
 			/*
-			 * Look for NS RRset first.
+			 * Look for NS/SOA RRsets first.
 			 */
 			for (rdataset = ISC_LIST_HEAD(name->list);
 			     rdataset != NULL;
@@ -4141,7 +4141,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
 					return (DNS_R_FORMERR);
 				if (type == dns_rdatatype_ns) {
 					/*
-					 * NS or SIG NS.
+					 * NS or RRSIG NS.
 					 *
 					 * Only one set of NS RRs is allowed.
 					 */
@@ -4159,17 +4159,9 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
 						DNS_RDATASETATTR_CACHE;
 					rdataset->trust = dns_trust_glue;
 				}
-			}
-			for (rdataset = ISC_LIST_HEAD(name->list);
-			     rdataset != NULL;
-			     rdataset = ISC_LIST_NEXT(rdataset, link)) {
-				type = rdataset->type;
-				if (type == dns_rdatatype_rrsig)
-					type = rdataset->covers;
-				if (type == dns_rdatatype_soa ||
-				    type == dns_rdatatype_nsec) {
+				if (type == dns_rdatatype_soa) {
 					/*
-					 * SOA, RRSIG SOA, NSEC, or RRSIG NSEC.
+					 * SOA, or RRSIG SOA.
 					 *
 					 * Only one SOA is allowed.
 					 */
@@ -4180,8 +4172,38 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
 							return (DNS_R_FORMERR);
 						soa_name = name;
 					}
-					if (ns_name == NULL) {
-						negative_response = ISC_TRUE;
+					name->attributes |=
+						DNS_NAMEATTR_NCACHE;
+					rdataset->attributes |=
+						DNS_RDATASETATTR_NCACHE;
+					if (aa)
+						rdataset->trust =
+						    dns_trust_authauthority;
+					else
+						rdataset->trust =
+							dns_trust_additional;
+				}
+			}
+			/*
+			 * A negative response has a SOA record (Type 2) 
+			 * and a optional NS RRset (Type 1) or it has neither
+			 * a SOA or a NS RRset (Type 3) or rcode is NXDOMAIN
+			 * (handled above) in which case the NS RRset is
+			 * allowed (Type 4).
+			 */
+			if (soa_name != NULL || ns_name == NULL)
+				negative_response = ISC_TRUE;
+			for (rdataset = ISC_LIST_HEAD(name->list);
+			     rdataset != NULL;
+			     rdataset = ISC_LIST_NEXT(rdataset, link)) {
+				type = rdataset->type;
+				if (type == dns_rdatatype_rrsig)
+					type = rdataset->covers;
+				if (type == dns_rdatatype_nsec) {
+					/*
+					 * NSEC or RRSIG NSEC.
+					 */
+					if (negative_response) {
 						name->attributes |=
 							DNS_NAMEATTR_NCACHE;
 						rdataset->attributes |=
@@ -4210,7 +4232,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
 					 * this is a referral, and there
 					 * should only be one DS.
 					 */
-					if (negative_response)
+					if (ns_name == NULL)
 						return (DNS_R_FORMERR);
 					if (rdataset->type ==
 					    dns_rdatatype_ds) {

From 3e15f55914e341b45bf7f2fdb13905854f3464cf Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 02:12:37 +0000
Subject: [PATCH 29/40] move the calculation of remaining

---
 bin/dig/dig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 103963c8be..b6afa4fa04 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.198 2004/09/16 01:01:25 marka Exp $ */
+/* $Id: dig.c,v 1.199 2004/09/16 02:12:37 marka Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -636,9 +636,9 @@ printgreeting(int argc, char **argv, dig_lookup_t *lookup) {
 				 "; (%d server%s found)\n",
 				 addresscount,
 				 addresscount > 1 ? "s" : "");
-			strncat(lookup->cmdline, append, remaining);
 			remaining = sizeof(lookup->cmdline) -
 				    strlen(lookup->cmdline) - 1;
+			strncat(lookup->cmdline, append, remaining);
 		}
 		if (first) {
 			snprintf(append, sizeof(append), 

From c93003b0a6c063c15495f66300a1822481728fca Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 02:49:41 +0000
Subject: [PATCH 30/40] 1713.   [port]          linux: extend capset failure
 message to say:                         please ensure that the capset kernel
 module is                         loaded.  see insmod(8)

---
 CHANGES             | 4 +++-
 bin/named/unix/os.c | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index f6551163ed..0e941f4c1a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,7 +24,9 @@
 			address when a nameserver was specified by name.
 			[RT #12286]
 
-1713.	[placeholder]	rt12375
+1713.	[port]		linux: extend capset failure message to say:
+			please ensure that the capset kernel module is
+			loaded.  see insmod(8)
 
 1712.	[bug]		Missing FULLCHECK for "trusted-key" in dig.
 
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 1fd9e08a5f..14b7f19553 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.68 2004/05/04 03:24:39 marka Exp $ */
+/* $Id: os.c,v 1.69 2004/09/16 02:49:41 marka Exp $ */
 
 #include <config.h>
 #include <stdarg.h>
@@ -161,7 +161,10 @@ linux_setcaps(unsigned int caps) {
 	cap.inheritable = caps;
 	if (syscall(SYS_capset, &caphead, &cap) < 0) {
 		isc__strerror(errno, strbuf, sizeof(strbuf));
-		ns_main_earlyfatal("capset failed: %s", strbuf);
+		ns_main_earlyfatal("capset failed: %s:"
+				   " please ensure that the capset kernel"
+				   " module is loaded.  see insmod(8)",
+				   strbuf);
 	}
 }
 

From 12e8e73d76f78649cb61ba161eb51faf851ddb4a Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 04:54:03 +0000
Subject: [PATCH 31/40] 1722.   [bug]           Don't commit the journal on
 malformed ixfr streams.                         [RT #12519]

1721.   [bug]           Error message from the journal processing were not
                        always identifing the relevent journal. [RT #12519]
---
 CHANGES           |  6 ++++--
 lib/dns/journal.c | 24 +++++++++++++-----------
 lib/dns/xfrin.c   |  5 +++--
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index 0e941f4c1a..3271d9437d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-1722.	[placeholder]	rt12519
+1722.	[bug]		Don't commit the journal on malformed ixfr streams.
+			[RT #12519]
 
-1721.	[placeholder]	rt12519
+1721.	[bug]		Error message from the journal processing were not
+			always identifing the relevent journal. [RT #12519]
 
 1720.	[bug]		'dig +chase' did not terminate on a RFC 2308 Type 1
 			negative response. [RT #12506]
diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 5930af4fe0..b2b0306b7f 100644
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: journal.c,v 1.88 2004/05/14 05:08:00 marka Exp $ */
+/* $Id: journal.c,v 1.89 2004/09/16 04:54:03 marka Exp $ */
 
 #include <config.h>
 
@@ -1035,8 +1035,8 @@ dns_journal_commit(dns_journal_t *j) {
 	 */
 	if (j->x.n_soa != 2) {
 		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
-			      "malformed transaction: %d SOAs",
-			      j->x.n_soa);
+			      "%s: malformed transaction: %d SOAs",
+			      j->filename, j->x.n_soa);
 		return (ISC_R_UNEXPECTED);
 	}
 	if (! (DNS_SERIAL_GT(j->x.pos[1].serial, j->x.pos[0].serial) ||
@@ -1044,8 +1044,8 @@ dns_journal_commit(dns_journal_t *j) {
 		j->x.pos[1].serial == j->x.pos[0].serial)))
 	{
 		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
-			      "malformed transaction: serial number "
-			      "would decrease");
+			      "%s: malformed transaction: serial number "
+			      "would decrease", j->filename);
 		return (ISC_R_UNEXPECTED);
 	}
 	if (! JOURNAL_EMPTY(&j->header)) {
@@ -1266,8 +1266,8 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 
 		if (++n_put > 100)  {
 			isc_log_write(JOURNAL_DEBUG_LOGARGS(3),
-				      "applying diff to database (%u)",
-				      db_serial);
+				      "%s: applying diff to database (%u)",
+				      j->filename, db_serial);
 			(void)dns_diff_print(&diff, NULL);
 			CHECK(dns_diff_apply(&diff, db, ver));
 			dns_diff_clear(&diff);
@@ -1280,8 +1280,8 @@ roll_forward(dns_journal_t *j, dns_db_t *db) {
 
 	if (n_put != 0) {
 		isc_log_write(JOURNAL_DEBUG_LOGARGS(3),
-			      "applying final diff to database (%u)",
-			      db_serial);
+			      "%s: applying final diff to database (%u)",
+			      j->filename, db_serial);
 		(void)dns_diff_print(&diff, NULL);
 		CHECK(dns_diff_apply(&diff, db, ver));
 		dns_diff_clear(&diff);
@@ -1352,7 +1352,8 @@ dns_journal_print(isc_mem_t *mctx, const char *filename, FILE *file) {
 
 	if (result != ISC_R_SUCCESS) {
 		isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
-			      "journal open failure");
+			      "journal open failure: %s: %s",
+			      isc_result_totext(result), j->filename);
 		return (result);
 	}
 
@@ -1545,7 +1546,8 @@ read_one_rr(dns_journal_t *j) {
 		CHECK(journal_read_xhdr(j, &xhdr));
 		if (xhdr.size == 0) {
 			isc_log_write(JOURNAL_COMMON_LOGARGS, ISC_LOG_ERROR,
-				      "journal corrupt: empty transaction");
+				      "%s: journal corrupt: empty transaction",
+				      j->filename);
 			FAIL(ISC_R_UNEXPECTED);
 		}
 		if (xhdr.serial0 != j->it.current_serial) {
diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 88d20a4f9e..efd5090d76 100644
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: xfrin.c,v 1.136 2004/06/27 10:10:55 jakob Exp $ */
+/* $Id: xfrin.c,v 1.137 2004/09/16 04:54:03 marka Exp $ */
 
 #include <config.h>
 
@@ -500,8 +500,8 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 	case XFRST_IXFR_ADD:
 		if (rdata->type == dns_rdatatype_soa) {
 			isc_uint32_t soa_serial = dns_soa_getserial(rdata);
-			CHECK(ixfr_commit(xfr));
 			if (soa_serial == xfr->end_serial) {
+				CHECK(ixfr_commit(xfr));
 				xfr->state = XFRST_END;
 				break;
 			} else if (soa_serial != xfr->ixfr.current_serial) {
@@ -511,6 +511,7 @@ xfr_rr(dns_xfrin_ctx_t *xfr, dns_name_t *name, isc_uint32_t ttl,
 					  xfr->ixfr.current_serial, soa_serial);
 				FAIL(DNS_R_FORMERR);
 			} else {
+				CHECK(ixfr_commit(xfr));
 				xfr->state = XFRST_IXFR_DELSOA;
 				goto redo;
 			}

From e69e3979440a4e750cf0cecb5c5498efe67f07b4 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 05:13:55 +0000
Subject: [PATCH 32/40] make -j3 support

---
 lib/dns/Makefile.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index df55da5ef4..84db576e07 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.146 2004/07/20 07:13:41 marka Exp $
+# $Id: Makefile.in,v 1.147 2004/09/16 05:13:55 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -29,7 +29,8 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
-CINCLUDES =	-I. ${DNS_INCLUDES} ${ISC_INCLUDES}
+CINCLUDES =	-I. -Iinclude -Iinclude/sec/dst/include \
+		${DNS_INCLUDES} ${ISC_INCLUDES}
 
 CDEFINES =
 CWARNINGS =
@@ -161,4 +162,5 @@ subdirs: include/dns/enumtype.h include/dns/enumclass.h \
 	include/dns/rdatastruct.h code.h
 ${DNSOBJS}: include/dns/enumtype.h include/dns/enumclass.h \
 	include/dns/rdatastruct.h
+${DSTOBJS}: subdirs
 rdata.${0}: code.h

From 3ca9bffc1d5db55ccb41d03bf2cf3e94b5d714fd Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 07:02:53 +0000
Subject: [PATCH 33/40] silence compiler

---
 lib/bind/inet/inet_makeaddr.c | 14 +++++++-------
 lib/bind/nameser/ns_print.c   |  4 ++--
 lib/lwres/print.c             | 32 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/lib/bind/inet/inet_makeaddr.c b/lib/bind/inet/inet_makeaddr.c
index 1d20619b99..6e4ecc37cc 100644
--- a/lib/bind/inet/inet_makeaddr.c
+++ b/lib/bind/inet/inet_makeaddr.c
@@ -51,16 +51,16 @@ struct in_addr
 inet_makeaddr(net, host)
 	u_long net, host;
 {
-	u_long addr;
+	struct in_addr a;
 
 	if (net < 128U)
-		addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
+		a.s_addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
 	else if (net < 65536U)
-		addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
+		a.s_addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
 	else if (net < 16777216L)
-		addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
+		a.s_addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
 	else
-		addr = net | host;
-	addr = htonl(addr);
-	return (*(struct in_addr *)&addr);
+		a.s_addr = net | host;
+	a.s_addr = htonl(a.s_addr);
+	return (a);
 }
diff --git a/lib/bind/nameser/ns_print.c b/lib/bind/nameser/ns_print.c
index 10a4093299..d74e878a5a 100644
--- a/lib/bind/nameser/ns_print.c
+++ b/lib/bind/nameser/ns_print.c
@@ -16,7 +16,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: ns_print.c,v 1.8 2004/09/16 00:56:12 marka Exp $";
+static const char rcsid[] = "$Id: ns_print.c,v 1.9 2004/09/16 07:02:52 marka Exp $";
 #endif
 
 /* Import. */
@@ -706,7 +706,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen,
 	char *p;
 
 	len = SPRINTF((tmp, "\\# %u%s\t; %s", (unsigned)(edata - rdata),
-		       rdlen != 0 ? " (" : "", comment));
+		       rdlen != 0U ? " (" : "", comment));
 	T(addstr(tmp, len, &buf, &buflen));
 	while (rdata < edata) {
 		p = tmp;
diff --git a/lib/lwres/print.c b/lib/lwres/print.c
index 767a65b21c..7f4cea233f 100644
--- a/lib/lwres/print.c
+++ b/lib/lwres/print.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: print.c,v 1.3 2004/09/16 01:01:27 marka Exp $ */
+/* $Id: print.c,v 1.4 2004/09/16 07:02:53 marka Exp $ */
 
 #include <config.h>
 
@@ -201,7 +201,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 		case 'x':
 		case 'X':
 		doint:
-			if (precision != 0)
+			if (precision != 0U)
 				zero = 0;
 			switch (*format) {
 			case 'n':
@@ -276,7 +276,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 					tmpui = va_arg(ap, unsigned int);
 				if (alt) {
 					head = "0x";
-					if (precision > 2)
+					if (precision > 2U)
 						precision -= 2;
 				}
 				sprintf(buf, "%llx", tmpui);
@@ -291,19 +291,19 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 					tmpui = va_arg(ap, unsigned int);
 				if (alt) {
 					head = "0X";
-					if (precision > 2)
+					if (precision > 2U)
 						precision -= 2;
 				}
 				sprintf(buf, "%llX", tmpui);
 				goto printint;
 			printint:
-				if (precision != 0 || width != 0) {
+				if (precision != 0U || width != 0U) {
 					length = strlen(buf);
 					if (length < precision)
 						zeropad = precision - length;
 					else if (length < width && zero)
 						zeropad = width - length;
-					if (width != 0) {
+					if (width != 0U) {
 						pad = width - length -
 						      zeropad - strlen(head);
 						if (pad < 0)
@@ -348,7 +348,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			cp = va_arg(ap, char *);
 			REQUIRE(cp != NULL);
 
-			if (precision != 0) {
+			if (precision != 0U) {
 				/*
 				 * cp need not be NULL terminated.
 				 */
@@ -357,13 +357,13 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 
 				n = precision;
 				tp = cp;
-				while (n != 0 && *tp != '\0')
+				while (n != 0U && *tp != '\0')
 					n--, tp++;
 				length = precision - n;
 			} else {
 				length = strlen(cp);
 			}
-			if (width != 0) {
+			if (width != 0U) {
 				pad = width - length;
 				if (pad < 0)
 					pad = 0;
@@ -375,8 +375,8 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 					size--;
 					pad--;
 				}
-			if (precision != 0)
-				while (precision > 0 && *cp != '\0' &&
+			if (precision != 0U)
+				while (precision > 0U && *cp != '\0' &&
 				       size > 1U) {
 					*str++ = *cp++;
 					size--;
@@ -395,14 +395,14 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			break;
 		case 'c':
 			c = va_arg(ap, int);
-			if (width > 0) {
+			if (width > 0U) {
 				count += width;
 				width--;
 				if (left) {
 					*str++ = c;
 					size--;
 				}
-				while (width-- > 0 && size > 1U) {
+				while (width-- > 0U && size > 1U) {
 					*str++ = ' ';
 					size--;
 				}
@@ -424,7 +424,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			length = strlen(buf);
 			if (precision > length)
 				zeropad = precision - length;
-			if (width > 0) {
+			if (width > 0U) {
 				pad = width - length - zeropad;
 				if (pad < 0)
 					pad = 0;
@@ -494,7 +494,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 			 * if we cap the precision at 512 we will not
 			 * overflow buf.
 			 */
-			if (precision > 512)
+			if (precision > 512U)
 				precision = 512;
 			sprintf(fmt, "%%%s%s.%lu%s%c", alt ? "#" : "",
 				plus ? "+" : space ? " " : "",
@@ -516,7 +516,7 @@ lwres__print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 					sprintf(buf, fmt, dbl);
 				}
 				length = strlen(buf);
-				if (width > 0) {
+				if (width > 0U) {
 					pad = width - length;
 					if (pad < 0)
 						pad = 0;

From a449ffac7fa795475bb920728501ac8bd69dd624 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 16 Sep 2004 07:08:43 +0000
Subject: [PATCH 34/40] silence compiler

---
 lib/bind/resolv/res_findzonecut.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/bind/resolv/res_findzonecut.c b/lib/bind/resolv/res_findzonecut.c
index dcc9f71f3d..7f053ab70d 100644
--- 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 2004/03/18 02:58:01 marka Exp $";
+static const char rcsid[] = "$Id: res_findzonecut.c,v 1.8 2004/09/16 07:08:43 marka Exp $";
 #endif /* not lint */
 
 /*
@@ -360,8 +360,9 @@ get_soa(res_state statp, const char *dname, ns_class class, int opts,
 				abort();
 			}
 			if (strlen(t) + 1 > zsize) {
-				DPRINTF(("get_soa: zname(%d) too small (%d)",
-					 zsize, strlen(t) + 1));
+				DPRINTF(("get_soa: zname(%lu) too small (%lu)",
+					 (unsigned long)zsize,
+					 (unsigned long)strlen(t) + 1));
 				errno = EMSGSIZE;
 				goto cleanup;
 			}

From 0d51617897658fcd9eed3a22f7ac8d77a7a260be Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 17 Sep 2004 05:59:28 +0000
Subject: [PATCH 35/40] silence compiler

---
 lib/lwres/context.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/lwres/context.c b/lib/lwres/context.c
index 61c43634e6..0db414c3f6 100644
--- a/lib/lwres/context.c
+++ b/lib/lwres/context.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: context.c,v 1.45 2004/03/05 05:12:45 marka Exp $ */
+/* $Id: context.c,v 1.46 2004/09/17 05:59:28 marka Exp $ */
 
 #include <config.h>
 
@@ -346,13 +346,12 @@ lwres_context_sendrecv(lwres_context_t *ctx,
 	struct timeval timeout;
 
 	/*
-	 * Type of tv_sec is long, so make sure the unsigned long timeout
-	 * does not overflow it.
+	 * Type of tv_sec is 32 bits long. 
 	 */
-	if (ctx->timeout <= (unsigned int)LONG_MAX)
-		timeout.tv_sec = (long)ctx->timeout;
+	if (ctx->timeout <= 0x7FFFFFFFU)
+		timeout.tv_sec = (int)ctx->timeout;
 	else
-		timeout.tv_sec = LONG_MAX;
+		timeout.tv_sec = 0x7FFFFFFF;
 
 	timeout.tv_usec = 0;
 

From f8ea15836682427e559a70d76179f7b745082974 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 17 Sep 2004 13:33:58 +0000
Subject: [PATCH 36/40] silence compiler

---
 lib/bind/irs/getpwent_r.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/bind/irs/getpwent_r.c b/lib/bind/irs/getpwent_r.c
index 733b6e81cb..d299f7a68b 100644
--- a/lib/bind/irs/getpwent_r.c
+++ b/lib/bind/irs/getpwent_r.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: getpwent_r.c,v 1.6 2004/03/09 06:30:02 marka Exp $";
+static const char rcsid[] = "$Id: getpwent_r.c,v 1.7 2004/09/17 13:33:58 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <port_before.h>
@@ -130,7 +130,7 @@ getpwuid_r(uid_t uid,  struct passwd *pwptr, char *buf, int buflen) {
 PASS_R_RETURN
 getpwent_r(struct passwd *pwptr, PASS_R_ARGS) {
 	struct passwd *pw = getpwent();
-	int res;
+	int res = 0;
 
 	if (pw == NULL)
 		return (PASS_R_BAD);
@@ -184,7 +184,7 @@ endpwent_r(void)
 PASS_R_RETURN
 fgetpwent_r(FILE *f, struct passwd *pwptr, PASS_R_COPY_ARGS) {
 	struct passwd *pw = fgetpwent(f);
-	int res;
+	int res = 0;
 
 	if (pw == NULL)
 		return (PASS_R_BAD);

From 3b9a0696f99c40222e50ddae4d0dd9611737c1da Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 21 Sep 2004 02:12:08 +0000
Subject: [PATCH 37/40] 1723.   [cleanup]       Silence compiler warnings from
 t_tasks.c. [RT #12493]

---
 CHANGES                   |  2 +
 bin/tests/tasks/t_tasks.c | 85 ++++++++++++++++++++++-----------------
 2 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3271d9437d..79bf754be7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1723.	[cleanup]	Silence compiler warnings from t_tasks.c. [RT #12493]
+
 1722.	[bug]		Don't commit the journal on malformed ixfr streams.
 			[RT #12519]
 
diff --git a/bin/tests/tasks/t_tasks.c b/bin/tests/tasks/t_tasks.c
index b16cd69b39..6e42237d18 100644
--- a/bin/tests/tasks/t_tasks.c
+++ b/bin/tests/tasks/t_tasks.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_tasks.c,v 1.33 2004/06/21 05:36:41 marka Exp $ */
+/* $Id: t_tasks.c,v 1.34 2004/09/21 02:12:08 marka Exp $ */
 
 #include <config.h>
 
@@ -38,6 +38,8 @@ isc_boolean_t threaded = ISC_TRUE;
 isc_boolean_t threaded = ISC_FALSE;
 #endif
 
+static int senders[4];
+
 static void
 require_threads(void) {
 	t_info("This test requires threads\n");
@@ -665,7 +667,6 @@ t_tasks3(void) {
 	unsigned int	workers;
 	isc_event_t	*event;
 	isc_result_t	isc_result;
-	void		*sender;
 	isc_eventtype_t	event_type;
 
 	T3_flag = 0;
@@ -674,7 +675,6 @@ t_tasks3(void) {
 	T3_nfails = 0;
 	T3_nprobs = 0;
 
-	sender = (void *) 1;
 	event_type = 3;
 
 	workers = 2;
@@ -738,15 +738,15 @@ t_tasks3(void) {
 	/*
 	 * This event causes the task to wait on T3_cv.
 	 */
-	event = isc_event_allocate(mctx, sender, event_type, t3_event1, NULL,
-				   sizeof(*event));
+	event = isc_event_allocate(mctx, &senders[1], event_type, t3_event1,
+				   NULL, sizeof(*event));
 	isc_task_send(task, &event);
 
 	/*
 	 * Now we fill up the task's event queue with some events.
 	 */
 	for (cnt = 0; cnt < T3_NEVENTS; ++cnt) {
-		event = isc_event_allocate(mctx, sender, event_type,
+		event = isc_event_allocate(mctx, &senders[1], event_type,
 					   t3_event2, NULL, sizeof(*event));
 		isc_task_send(task, &event);
 	}
@@ -886,7 +886,6 @@ t_tasks4(void) {
 	isc_task_t	*task;
 	unsigned int	workers;
 	isc_result_t	isc_result;
-	void		*sender;
 	isc_eventtype_t	event_type;
 	isc_event_t	*event;
 
@@ -895,7 +894,6 @@ t_tasks4(void) {
 	T4_flag = 0;
 
 	result = T_UNRESOLVED;
-	sender = (void *)1;
 	event_type = 4;
 
 	workers = 2;
@@ -965,8 +963,8 @@ t_tasks4(void) {
 	/*
 	 * This event causes the task to wait on T4_cv.
 	 */
-	event = isc_event_allocate(mctx, sender, event_type, t4_event1, NULL,
-				   sizeof(*event));
+	event = isc_event_allocate(mctx, &senders[1], event_type, t4_event1,
+				   NULL, sizeof(*event));
 	isc_task_send(task, &event);
 
 	isc_task_shutdown(task);
@@ -1085,7 +1083,6 @@ t_tasks7(void) {
 	isc_task_t	*task;
 	unsigned int	workers;
 	isc_result_t	isc_result;
-	void		*sender;
 	isc_eventtype_t	event_type;
 	isc_event_t	*event;
 	isc_time_t	now;
@@ -1097,7 +1094,6 @@ t_tasks7(void) {
 	T7_eflag = 0;
 
 	result = T_UNRESOLVED;
-	sender = (void *)1;
 	event_type = 7;
 
 	workers = 2;
@@ -1176,8 +1172,8 @@ t_tasks7(void) {
 		return(T_UNRESOLVED);
 	}
 
-	event = isc_event_allocate(mctx, sender, event_type, t7_event1, NULL,
-				   sizeof(*event));
+	event = isc_event_allocate(mctx, &senders[1], event_type, t7_event1,
+				   NULL, sizeof(*event));
 	isc_task_send(task, &event);
 
 	isc_task_shutdown(task);
@@ -1324,7 +1320,7 @@ t10_event2(isc_task_t *task, isc_event_t *event) {
 		       "NP" : "P");
 	}
 
-	if ((T10_purge_sender == 0) ||
+	if ((T10_purge_sender == NULL) ||
 	    (T10_purge_sender == event->ev_sender)) {
 		sender_match = 1;
 	}
@@ -1394,7 +1390,7 @@ t10_sde(isc_task_t *task, isc_event_t *event) {
 }
 
 static void
-t_taskpurge_x(int sender, int type, int tag, int purge_sender,
+t_taskpurge_x(int sender, int type, int tag, void *purge_sender,
 	      int purge_type_first, int purge_type_last, void *purge_tag,
 	      int exp_nevents, int *nfails, int *nprobs, int testrange)
 {
@@ -1419,7 +1415,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
 	T10_startflag = 0;
 	T10_shutdownflag = 0;
 	T10_eventcnt = 0;
-	T10_purge_sender = (void *) purge_sender;
+	T10_purge_sender = purge_sender;
 	T10_purge_type_first = (isc_eventtype_t) purge_type_first;
 	T10_purge_type_last = (isc_eventtype_t) purge_type_last;
 	T10_purge_tag = purge_tag;
@@ -1515,7 +1511,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
 			for (tag_cnt = 0; tag_cnt < T10_TAGCNT; ++tag_cnt) {
 				eventtab[event_cnt] =
 					isc_event_allocate(mctx,
-					    (void *)(sender + sender_cnt),
+					    &senders[sender + sender_cnt],
 					    (isc_eventtype_t)(type + type_cnt),
 					    t10_event2, NULL, sizeof(*event));
 
@@ -1544,7 +1540,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
 		/*
 		 * We're testing isc_task_purge.
 		 */
-		nevents = isc_task_purge(task, (void *)purge_sender,
+		nevents = isc_task_purge(task, purge_sender,
 					(isc_eventtype_t)purge_type_first,
 					purge_tag);
 		if (nevents != exp_nevents) {
@@ -1557,7 +1553,7 @@ t_taskpurge_x(int sender, int type, int tag, int purge_sender,
 		/*
 		 * We're testing isc_task_purgerange.
 		 */
-		nevents = isc_task_purgerange(task, (void *)purge_sender,
+		nevents = isc_task_purgerange(task, purge_sender,
 					     (isc_eventtype_t)purge_type_first,
 					     (isc_eventtype_t)purge_type_last,
 					     purge_tag);
@@ -1663,34 +1659,36 @@ t_tasks10(void) {
 	 * Try purging on a specific sender.
 	 */
 	t_info("testing purge on 2,4,8 expecting 1\n");
-	t_taskpurge_x(1, 4, 7, 2, 4, 4, (void *)8, 1, &T10_nfails,
+	t_taskpurge_x(1, 4, 7, &senders[2], 4, 4, (void *)8, 1, &T10_nfails,
 		      &T10_nprobs, 0);
 
 	/*
 	 * Try purging on all senders.
 	 */
 	t_info("testing purge on 0,4,8 expecting 3\n");
-	t_taskpurge_x(1, 4, 7, 0, 4, 4, (void *)8, 3, &T10_nfails,
+	t_taskpurge_x(1, 4, 7, NULL, 4, 4, (void *)8, 3, &T10_nfails,
 		      &T10_nprobs, 0);
 
 	/*
 	 * Try purging on all senders, specified type, all tags.
 	 */
 	t_info("testing purge on 0,4,0 expecting 15\n");
-	t_taskpurge_x(1, 4, 7, 0, 4, 4, NULL, 15, &T10_nfails, &T10_nprobs, 0);
+	t_taskpurge_x(1, 4, 7, NULL, 4, 4, NULL, 15, &T10_nfails,
+		      &T10_nprobs, 0);
 
 	/*
 	 * Try purging on a specified tag, no such type.
 	 */
 	t_info("testing purge on 0,99,8 expecting 0\n");
-	t_taskpurge_x(1, 4, 7, 0, 99, 99, (void *)8, 0, &T10_nfails,
+	t_taskpurge_x(1, 4, 7, NULL, 99, 99, (void *)8, 0, &T10_nfails,
 		      &T10_nprobs, 0);
 
 	/*
 	 * Try purging on specified sender, type, all tags.
 	 */
 	t_info("testing purge on 0,5,0 expecting 5\n");
-	t_taskpurge_x( 1, 4, 7, 3, 5, 5, NULL, 5, &T10_nfails, &T10_nprobs, 0);
+	t_taskpurge_x(1, 4, 7, &senders[3], 5, 5, NULL, 5, &T10_nfails,
+		      &T10_nprobs, 0);
 
 	result = T_UNRESOLVED;
 
@@ -2042,68 +2040,69 @@ t_tasks13(void) {
 	 * Try purging on a specific sender.
 	 */
 	t_info("testing purge on 2,4,8 expecting 1\n");
-	t_taskpurge_x(1, 4, 7, 2, 4, 4, (void *)8, 1,
+	t_taskpurge_x(1, 4, 7, &senders[2], 4, 4, (void *)8, 1,
 		      &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Try purging on all senders.
 	 */
 	t_info("testing purge on 0,4,8 expecting 3\n");
-	t_taskpurge_x(1, 4, 7, 0, 4, 4, (void *)8, 3,
+	t_taskpurge_x(1, 4, 7, NULL, 4, 4, (void *)8, 3,
 		      &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Try purging on all senders, specified type, all tags.
 	 */
 	t_info("testing purge on 0,4,0 expecting 15\n");
-	t_taskpurge_x(1, 4, 7, 0, 4, 4, NULL, 15, &T13_nfails, &T13_nprobs, 1);
+	t_taskpurge_x(1, 4, 7, NULL, 4, 4, NULL, 15, &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Try purging on a specified tag, no such type.
 	 */
 	t_info("testing purge on 0,99,8 expecting 0\n");
-	t_taskpurge_x(1, 4, 7, 0, 99, 99, (void *)8, 0,
+	t_taskpurge_x(1, 4, 7, NULL, 99, 99, (void *)8, 0,
 		      &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Try purging on specified sender, type, all tags.
 	 */
 	t_info("testing purge on 3,5,0 expecting 5\n");
-	t_taskpurge_x(1, 4, 7, 3, 5, 5, 0, 5, &T13_nfails, &T13_nprobs, 1);
+	t_taskpurge_x(1, 4, 7, &senders[3], 5, 5, 0, 5, &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Now let's try some ranges.
 	 */
 
 	t_info("testing purgerange on 2,4-5,8 expecting 2\n");
-	t_taskpurge_x(1, 4, 7, 2, 4, 5, (void *)8, 1,
+	t_taskpurge_x(1, 4, 7, &senders[2], 4, 5, (void *)8, 1,
 		      &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Try purging on all senders.
 	 */
 	t_info("testing purge on 0,4-5,8 expecting 5\n");
-	t_taskpurge_x(1, 4, 7, 0, 4, 5, (void *)8, 5,
+	t_taskpurge_x(1, 4, 7, NULL, 4, 5, (void *)8, 5,
 		      &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Try purging on all senders, specified type, all tags.
 	 */
 	t_info("testing purge on 0,5-6,0 expecting 28\n");
-	t_taskpurge_x(1, 4, 7, 0, 5, 6, NULL, 28, &T13_nfails, &T13_nprobs, 1);
+	t_taskpurge_x(1, 4, 7, NULL, 5, 6, NULL, 28, &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Try purging on a specified tag, no such type.
 	 */
 	t_info("testing purge on 0,99-101,8 expecting 0\n");
-	t_taskpurge_x(1, 4, 7, 0, 99, 101, (void *)8, 0,
+	t_taskpurge_x(1, 4, 7, NULL, 99, 101, (void *)8, 0,
 		      &T13_nfails, &T13_nprobs, 1);
 
 	/*
 	 * Try purging on specified sender, type, all tags.
 	 */
 	t_info("testing purge on 3,5-6,0 expecting 10\n");
-	t_taskpurge_x(1, 4, 7, 3, 5, 6, NULL, 10, &T13_nfails, &T13_nprobs, 1);
+	t_taskpurge_x(1, 4, 7, &senders[3], 5, 6, NULL, 10, &T13_nfails,
+		      &T13_nprobs, 1);
 
 	result = T_UNRESOLVED;
 
@@ -2137,7 +2136,8 @@ int t14_active[T14_NTASKS];
 
 static void
 t14_callback(isc_task_t *task, isc_event_t *event) {
-	int taskno = (int) event->ev_arg;
+	int taskno = *(int *)(event->ev_arg);
+
 
 	t_info("task enter %d\n", taskno);	
 	if (taskno == T14_EXCLTASK) {
@@ -2158,6 +2158,7 @@ t14_callback(isc_task_t *task, isc_event_t *event) {
 	}
 	t_info("task exit %d\n", taskno);
 	if (t14_done) {
+		isc_mem_put(event->ev_destroy_arg, event->ev_arg, sizeof (int));
 		isc_event_free(&event);
 	} else {
 		isc_task_send(task, &event);
@@ -2214,6 +2215,7 @@ t_tasks14(void) {
 
 	for (i = 0; i < T14_NTASKS; i++) {
 		isc_event_t *event;
+		int *v;
 
 		isc_result = isc_task_create(manager, 0, &tasks[i]);
 		if (isc_result != ISC_R_SUCCESS) {
@@ -2221,9 +2223,18 @@ t_tasks14(void) {
 			return(T_FAIL);
 		}
 
+		v = isc_mem_get(mctx, sizeof *v);
+		if (v == NULL) {
+			isc_task_detach(&tasks[i]);
+			t_info("isc_mem_get failed\n");
+			return(T_FAIL);
+		}
+		*v = i;
+
 		event = isc_event_allocate(mctx, NULL, 1, t14_callback,
-					   (void *)i, sizeof(*event));
+					   v, sizeof(*event));
 		if (event == NULL) {
+			isc_mem_put(mctx, v, sizeof *v);
 			t_info("isc_event_allocate failed\n");
 			return(T_UNRESOLVED);
 		}

From 561863ed947f18c8bfcaa631ad83a6bee3b7200b Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 21 Sep 2004 05:59:07 +0000
Subject: [PATCH 38/40] placholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 79bf754be7..030bf282c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1724.	[placeholder]	rt12557
+
 1723.	[cleanup]	Silence compiler warnings from t_tasks.c. [RT #12493]
 
 1722.	[bug]		Don't commit the journal on malformed ixfr streams.

From 4b030f887e5e51c00dac499682d0b5b870ece45b Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 22 Sep 2004 01:42:21 +0000
Subject: [PATCH 39/40] placeholder

---
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 030bf282c0..4fa8fab47e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1725.	[placeholder]	rt12541
+
 1724.	[placeholder]	rt12557
 
 1723.	[cleanup]	Silence compiler warnings from t_tasks.c. [RT #12493]

From 0795769851542deb0b7ba3d825d512b2f8ddfd19 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 24 Sep 2004 04:32:33 +0000
Subject: [PATCH 40/40] aix5

---
 lib/bind/configure.in                    |   3 +-
 lib/bind/port/aix5/.cvsignore            |   1 +
 lib/bind/port/aix5/Makefile.in           |  14 +++
 lib/bind/port/aix5/include/.cvsignore    |   1 +
 lib/bind/port/aix5/include/Makefile.in   |  34 ++++++
 lib/bind/port/aix5/include/sys/bitypes.h |  37 ++++++
 lib/bind/port/aix5/include/sys/cdefs.h   | 147 +++++++++++++++++++++++
 7 files changed, 236 insertions(+), 1 deletion(-)
 create mode 100644 lib/bind/port/aix5/.cvsignore
 create mode 100644 lib/bind/port/aix5/Makefile.in
 create mode 100644 lib/bind/port/aix5/include/.cvsignore
 create mode 100644 lib/bind/port/aix5/include/Makefile.in
 create mode 100644 lib/bind/port/aix5/include/sys/bitypes.h
 create mode 100644 lib/bind/port/aix5/include/sys/cdefs.h

diff --git a/lib/bind/configure.in b/lib/bind/configure.in
index 4c31915aff..7d74ae887f 100644
--- 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.92 $)
+AC_REVISION($Revision: 1.93 $)
 
 AC_INIT(resolv/herror.c)
 AC_PREREQ(2.13)
@@ -1075,6 +1075,7 @@ USE_FIONBIO_IOCTL="#undef USE_FIONBIO_IOCTL"
 case "$host" in
 	*aix3.2*)	PORT_DIR="port/aix32";;
 	*aix4*)		PORT_DIR="port/aix4";;
+	*aix5*)		PORT_DIR="port/aix5";;
 	*aux3*)		PORT_DIR="port/aux3";;
 	*-bsdi2*)	PORT_DIR="port/bsdos2";;
 	*-bsdi*)	PORT_DIR="port/bsdos";;
diff --git a/lib/bind/port/aix5/.cvsignore b/lib/bind/port/aix5/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/aix5/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/aix5/Makefile.in b/lib/bind/port/aix5/Makefile.in
new file mode 100644
index 0000000000..99e5985489
--- /dev/null
+++ b/lib/bind/port/aix5/Makefile.in
@@ -0,0 +1,14 @@
+# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001  Internet Software Consortium.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
diff --git a/lib/bind/port/aix5/include/.cvsignore b/lib/bind/port/aix5/include/.cvsignore
new file mode 100644
index 0000000000..f3c7a7c5da
--- /dev/null
+++ b/lib/bind/port/aix5/include/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/lib/bind/port/aix5/include/Makefile.in b/lib/bind/port/aix5/include/Makefile.in
new file mode 100644
index 0000000000..82034bbd84
--- /dev/null
+++ b/lib/bind/port/aix5/include/Makefile.in
@@ -0,0 +1,34 @@
+# Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2001  Internet Software Consortium.
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+# $Id: Makefile.in,v 1.1 2004/09/24 04:32:32 marka Exp $
+
+srcdir =        @srcdir@
+VPATH =         @srcdir@
+top_srcdir =    @top_srcdir@
+
+HEADERS= sys/bitypes.h sys/cdefs.h
+
+all:
+
+@BIND9_MAKE_RULES@
+
+installdirs:
+	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${includedir}/sys 
+
+install:: installdirs
+	for i in ${HEADERS}; do \
+		${INSTALL_DATA} ${srcdir}/$$i ${DESTDIR}${includedir}/sys; \
+	done
diff --git a/lib/bind/port/aix5/include/sys/bitypes.h b/lib/bind/port/aix5/include/sys/bitypes.h
new file mode 100644
index 0000000000..f16608cb16
--- /dev/null
+++ b/lib/bind/port/aix5/include/sys/bitypes.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 1996,1999 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#if !defined(__BIT_TYPES_DEFINED__) && !defined(_H_INTTYPES)
+#define __BIT_TYPES_DEFINED__
+
+	/*
+	 * Basic integral types.  Omit the typedef if
+	 * not possible for a machine/compiler combination.
+	 */
+	typedef /*signed*/ char            int8_t;
+	typedef unsigned char            u_int8_t;
+	typedef short                     int16_t;
+	typedef unsigned short          u_int16_t;
+	typedef int                       int32_t;
+	typedef unsigned int            u_int32_t;
+
+# if 0	/* don't fight with these unless you need them */
+	typedef long long                 int64_t;
+	typedef unsigned long long      u_int64_t;
+# endif
+
+#endif	/* __BIT_TYPES_DEFINED__ */
diff --git a/lib/bind/port/aix5/include/sys/cdefs.h b/lib/bind/port/aix5/include/sys/cdefs.h
new file mode 100644
index 0000000000..ce5527a1f4
--- /dev/null
+++ b/lib/bind/port/aix5/include/sys/cdefs.h
@@ -0,0 +1,147 @@
+/*
+ * ++Copyright++ 1991, 1993
+ * -
+ * Copyright (c) 1991, 1993
+ *    The Regents of the University of California.  All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ * 	This product includes software developed by the University of
+ * 	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--
+ */
+
+/*
+ *	@(#)cdefs.h	8.1 (Berkeley) 6/2/93
+ *	$Id: cdefs.h,v 1.1 2004/09/24 04:32:33 marka Exp $
+ */
+
+#ifndef	_CDEFS_H_
+#define	_CDEFS_H_
+
+#if defined(__cplusplus)
+#define	__BEGIN_DECLS	extern "C" {
+#define	__END_DECLS	};
+#else
+#define	__BEGIN_DECLS
+#define	__END_DECLS
+#endif
+
+/*
+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
+ * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
+ * in between its arguments.  __CONCAT can also concatenate double-quoted
+ * strings produced by the __STRING macro, but this only works with ANSI C.
+ */
+#ifdef __P
+#undef __P	/* /usr/include/net/radix.h may have defined it */
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+#define	__P(protos)	protos		/* full-blown ANSI C */
+#define	__CONCAT(x,y)	x ## y
+#define	__STRING(x)	#x
+
+#define	__const		const		/* define reserved names to standard */
+#define	__signed	signed
+#define	__volatile	volatile
+#if defined(__cplusplus)
+#define	__inline	inline		/* convert to C++ keyword */
+#else
+#ifndef __GNUC__
+#define	__inline			/* delete GCC keyword */
+#endif /* !__GNUC__ */
+#endif /* !__cplusplus */
+
+#else	/* !(__STDC__ || __cplusplus) */
+#define	__P(protos)	()		/* traditional C preprocessor */
+#define	__CONCAT(x,y)	x/**/y
+#define	__STRING(x)	"x"
+
+#ifndef __GNUC__
+#define	__const				/* delete pseudo-ANSI C keywords */
+#define	__inline
+#define	__signed
+#define	__volatile
+/*
+ * In non-ANSI C environments, new programs will want ANSI-only C keywords
+ * deleted from the program and old programs will want them left alone.
+ * When using a compiler other than gcc, programs using the ANSI C keywords
+ * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
+ * When using "gcc -traditional", we assume that this is the intent; if
+ * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
+ */
+#ifndef	NO_ANSI_KEYWORDS
+#define	const				/* delete ANSI C keywords */
+#define	inline
+#define	signed
+#define	volatile
+#endif
+#endif	/* !__GNUC__ */
+#endif	/* !(__STDC__ || __cplusplus) */
+
+/*
+ * GCC1 and some versions of GCC2 declare dead (non-returning) and
+ * pure (no side effects) functions using "volatile" and "const";
+ * unfortunately, these then cause warnings under "-ansi -pedantic".
+ * GCC2 uses a new, peculiar __attribute__((attrs)) style.  All of
+ * these work for GNU C++ (modulo a slight glitch in the C++ grammar
+ * in the distribution version of 2.5.5).
+ */
+#if !defined(__GNUC__) || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#define	__attribute__(x)	/* delete __attribute__ if non-gcc or gcc1 */
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#define	__dead		__volatile
+#define	__pure		__const
+#endif
+#endif
+
+/* Delete pseudo-keywords wherever they are not available or needed. */
+#ifndef __dead
+#define	__dead
+#define	__pure
+#endif
+
+#endif /* !_CDEFS_H_ */