9.1.3rc2

5 files changed, 46 insertions, 27 deletions

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 27aebb76..982f9fef 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.174.2.8 2001/04/26 18:20:47 gson Exp $ */
+/* $Id: dighost.c,v 1.174.2.11 2001/06/15 01:37:30 bwelling Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -159,6 +159,9 @@ recv_done(isc_task_t *task, isc_event_t *event);
 static void
 connect_timeout(isc_task_t *task, isc_event_t *event);
 
+static void
+launch_next_query(dig_query_t *query, isc_boolean_t include_question);
+
 char *
 next_token(char **stringp, const char *delim) {
 	char *res;
@@ -1785,6 +1788,8 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
 		fputs(l->cmdline, stdout);
 		printf(";; connection timed out; no servers could be "
 		       "reached\n");
+		if (exitcode < 9)
+			exitcode = 9;
 		cancel_lookup(l);
 	}
 	UNLOCK_LOOKUP;
@@ -1850,11 +1855,13 @@ tcp_length_done(isc_task_t *task, isc_event_t *event) {
 	b = ISC_LIST_HEAD(sevent->bufferlist);
 	ISC_LIST_DEQUEUE(sevent->bufferlist, &query->lengthbuf, link);
 	length = isc_buffer_getuint16(b);
-	if (length > COMMSIZE) {
+	if (length == 0) {
 		isc_event_free(&event);
-		fatal("Length of %X was longer than I can handle!",
-		      length);
+		launch_next_query(query, ISC_FALSE);
+		UNLOCK_LOOKUP;
+		return;
 	}
+
 	/*
 	 * Even though the buffer was already init'ed, we need
 	 * to redo it now, to force the length we want.
diff --git a/bin/dnssec/dnssectool.c b/bin/dnssec/dnssectool.c
index 87c08235..f4669fb7 100644
--- a/bin/dnssec/dnssectool.c
+++ b/bin/dnssec/dnssectool.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssectool.c,v 1.26.2.1 2001/01/09 22:31:35 bwelling Exp $ */
+/* $Id: dnssectool.c,v 1.26.2.2 2001/06/08 23:27:29 bwelling Exp $ */
 
 #include <config.h>
 
@@ -267,23 +267,26 @@ setup_entropy(isc_mem_t *mctx, const char *randomfile, isc_entropy_t **ectx) {
 	result = isc_entropy_create(mctx, ectx);
 	if (result != ISC_R_SUCCESS)
 		fatal("could not create entropy object");
-	if (randomfile != NULL && strcasecmp(randomfile, "keyboard") != 0) {
+
+#ifdef PATH_RANDOMDEV
+	if (randomfile == NULL) {
+		result = isc_entropy_createfilesource(*ectx, PATH_RANDOMDEV);
+		if (result == ISC_R_SUCCESS)
+			return;
+	}
+#endif
+
+	if (randomfile != NULL && strcasecmp(randomfile, "keyboard") == 0) {
+		wantkeyboard = ISC_TRUE;
+		randomfile = NULL;
+	}
+		
+	if (randomfile != NULL) {
 		result = isc_entropy_createfilesource(*ectx, randomfile);
 		if (result != ISC_R_SUCCESS)
 			fatal("could not open randomdev %s: %s", randomfile,
 			      isc_result_totext(result));
-	}
-	else {
-#ifdef PATH_RANDOMDEV
-		if (randomfile == NULL) {
-			result = isc_entropy_createfilesource(*ectx,
-							      PATH_RANDOMDEV);
-			if (result == ISC_R_SUCCESS)
-				return;
-		}
-		else
-#endif
-			wantkeyboard = ISC_TRUE;
+	} else {
 		result = isc_entropy_createcallbacksource(*ectx, kbdstart,
 							  kbdget, kbdstop,
 							  &kbd, &source);
diff --git a/bin/named/log.c b/bin/named/log.c
index 4ef9cdf9..180f3bd7 100644
--- a/bin/named/log.c
+++ b/bin/named/log.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.27.2.1 2001/01/09 22:31:54 bwelling Exp $ */
+/* $Id: log.c,v 1.27.2.2 2001/06/15 01:41:11 bwelling Exp $ */
 
 #include <config.h>
 
@@ -144,13 +144,15 @@ ns_log_setsafechannels(isc_logconfig_t *lcfg) {
 					       NULL, 0);
 		if (result != ISC_R_SUCCESS)
 			goto cleanup;
-	}
 
-	/*
-	 * Setting the debug level to zero should get the output
-	 * discarded a bit faster.
-	 */
-	isc_log_setdebuglevel(ns_g_lctx, 0);
+		/*
+		 * Setting the debug level to zero should get the output
+		 * discarded a bit faster.
+		 */
+		isc_log_setdebuglevel(ns_g_lctx, 0);
+	} else {
+		isc_log_setdebuglevel(ns_g_lctx, ns_g_debuglevel);
+	}
 
 	result = ISC_R_SUCCESS;
 
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 029e3891..4ab8af88 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -15,11 +15,12 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: os.c,v 1.36.2.2 2001/01/09 22:32:50 bwelling Exp $ */
+/* $Id: os.c,v 1.36.2.3 2001/06/06 22:16:03 gson Exp $ */
 
 #include <config.h>
 #include <stdarg.h>
 
+#include <sys/types.h>  /* dev_t FreeBSD 2.1 */
 #include <sys/stat.h>
 
 #include <ctype.h>
diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh
index a440590c..cbf5d6f4 100755
--- a/bin/tests/system/ifconfig.sh
+++ b/bin/tests/system/ifconfig.sh
@@ -15,7 +15,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: ifconfig.sh,v 1.25.4.1 2001/01/09 22:34:37 bwelling Exp $
+# $Id: ifconfig.sh,v 1.25.4.2 2001/06/06 21:52:00 gson Exp $
 
 #
 # Set up interface aliases for bind9 system tests.
@@ -53,6 +53,9 @@ case "$1" in
 		    *-unknown-freebsdelf4.*)
 			ifconfig lo0 10.53.0.$ns alias netmask 0xffffffff
 			;;
+		    *-UnixWare7*)
+			ifconfig lo0 10.53.0.$ns alias netmask 0xffffffff
+			;;
 		    *-unknown-netbsd*)
 			ifconfig lo0 10.53.0.$ns alias netmask 255.255.255.0
 			;;
@@ -109,6 +112,9 @@ case "$1" in
 		    *-sgi-irix6.*)
 			ifconfig lo0 -alias 10.53.0.$ns
 			;;
+		    *-UnixWare7*)
+			ifconfig lo0 -alias 10.53.0.$ns
+			;;
 		    *-ibm-aix4.*)
 			ifconfig lo0 delete 10.53.0.$ns
 			;;