pullup:

1082.  [bug]           The -g option to named incorrectly caused logging
                       to be sent to syslog in addition to stderr.
                       [RT #1974]

diff --git a/CHANGES b/CHANGES
index bdaf878063a34e2bc35595737602dcbdd1ae1715..dcd01193e602339ff9de094c49863db736b13d5a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+1082.  [bug]           The -g option to named incorrectly caused logging
+                       to be sent to syslog in addition to stderr.
+                       [RT #1974]
+
 1074.  [bug]           Running out of memory in dump_rdataset() could
                        cause an assertion failure. [RT #1946]
 

diff --git a/bin/named/log.c b/bin/named/log.c
index 180f3bd74601e25ccfe1c406a6a3d9d9e450fa6d..86c0ea482d07ac8fca040469e31b758d2a47545f 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.2 2001/06/15 01:41:11 bwelling Exp $ */
+/* $Id: log.c,v 1.27.2.3 2001/10/31 22:46:19 marka Exp $ */
 
 #include <config.h>
 
@@ -164,10 +164,12 @@ isc_result_t
 ns_log_setdefaultcategory(isc_logconfig_t *lcfg) {
        isc_result_t result;
 
-       result = isc_log_usechannel(lcfg, "default_syslog",
-                                   ISC_LOGCATEGORY_DEFAULT, NULL);
-       if (result != ISC_R_SUCCESS)
-               goto cleanup;
+       if (! ns_g_logstderr) {
+               result = isc_log_usechannel(lcfg, "default_syslog",
+                                           ISC_LOGCATEGORY_DEFAULT, NULL);
+               if (result != ISC_R_SUCCESS)
+                       goto cleanup;
+       }
 
        result = isc_log_usechannel(lcfg, "default_debug",
                                    ISC_LOGCATEGORY_DEFAULT, NULL);