pullup:

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

diff --git a/CHANGES b/CHANGES
index fe228a473bfc590240da4bceab86ab8eef60c534..16a0a1546f98b19f24676c8f7ef088f49f6f9a34 100644 (file)
--- 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 4ef9cdf9bdd95660e609018e7747536bbf2e581c..180f3bd74601e25ccfe1c406a6a3d9d9e450fa6d 100644 (file)
--- 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;