From: Brian Wellington <source@isc.org>
Date: Fri, 15 Jun 2001 01:41:11 +0000 (+0000)
Subject: pullup:
X-Git-Tag: v9.1.3rc2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d0f47dc9b6c9158251f14da578d6ae5fa1026b3;p=thirdparty%2Fbind9.git

pullup:
 902.	[bug]		The -d option was ignored if both -t and -g were also
			specified.
---

diff --git a/CHANGES b/CHANGES
index fe228a473bf..16a0a1546f9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
  903.	[bug]		dig should not crash when receiving a TCP packet
  			of length 0.
 
+ 902.	[bug]		The -d option was ignored if both -t and -g were also
+			specified.
+
  901.	[cleanup]	The man pages no longer have empty lines outside of
 			literal blocks.
 
diff --git a/bin/named/log.c b/bin/named/log.c
index 4ef9cdf9bdd..180f3bd7460 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;