pullup:

1042.   [bug]           The "config" logging category did not work properly.
                        [RT #1873]

diff --git a/CHANGES b/CHANGES
index 2ef5bb8189b0590f4ed52fa4a069c071c20066cd..b3d22666c25346b8efbc3dbfd306ccb23677bbbb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+1042.  [bug]           The "config" logging category did not work properly.
+                       [RT #1873]
+
 1041.  [bug]           Dig/host/nslookup could catch an assertion failure
                        on SIGINT due to an uninitialized variable. [RT #1867]
 

diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index 8d568b8683d3f0a4693891a37b016b31ea586de7..14db627f98a034306d25f9826a16c85853ef0d86 100644 (file)
--- a/bin/named/logconf.c
+++ b/bin/named/logconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: logconf.c,v 1.30.2.2 2001/09/28 18:35:02 bwelling Exp $ */
+/* $Id: logconf.c,v 1.30.2.3 2001/10/11 02:03:20 marka Exp $ */
 
 #include <config.h>
 
@@ -74,7 +74,7 @@ category_fromconf(cfg_obj_t *ccat, isc_logconfig_t *lctx) {
                result = isc_log_usechannel(lctx, channelname, category,
                                            module);
                if (result != ISC_R_SUCCESS) {
-                       isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_CONFIG,
+                       isc_log_write(ns_g_lctx, CFG_LOGCATEGORY_CONFIG,
                                      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
                                      "logging channel '%s': %s", channelname,
                                      isc_result_totext(result));
@@ -221,7 +221,7 @@ channel_fromconf(cfg_obj_t *channel, isc_logconfig_t *lctx) {
                 */
                result = isc_stdio_open(dest.file.name, "a", &fp);
                if (result != ISC_R_SUCCESS)
-                       isc_log_write(ns_g_lctx, DNS_LOGCATEGORY_CONFIG,
+                       isc_log_write(ns_g_lctx, CFG_LOGCATEGORY_CONFIG,
                                      NS_LOGMODULE_SERVER, ISC_LOG_ERROR,
                                      "logging channel '%s' file '%s': %s",
                                      channelname, dest.file.name,

diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index 6a0598657b8e13b9243887272f20b0678370aaca..b65259d17274492f6e2c08d22a181420d3b73a59 100644 (file)
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.h,v 1.30 2001/08/27 03:36:00 marka Exp $ */
+/* $Id: log.h,v 1.30.2.1 2001/10/11 02:03:23 marka Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -32,7 +32,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
 #define DNS_LOGCATEGORY_NOTIFY         (&dns_categories[0])
 #define DNS_LOGCATEGORY_DATABASE       (&dns_categories[1])
 #define DNS_LOGCATEGORY_SECURITY       (&dns_categories[2])
-#define DNS_LOGCATEGORY_CONFIG         (&dns_categories[3])
+/* DNS_LOGCATEGORY_CONFIG superseded by CFG_LOGCATEGORY_CONFIG */
 #define DNS_LOGCATEGORY_DNSSEC         (&dns_categories[4])
 #define DNS_LOGCATEGORY_RESOLVER       (&dns_categories[5])
 #define DNS_LOGCATEGORY_XFER_IN                (&dns_categories[6])

diff --git a/lib/dns/log.c b/lib/dns/log.c
index 8b95316a6ade62ead08a963d61ff034664398b21..caf6a70f8473bfcb26f297e2bf69b8beee0bfe28 100644 (file)
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log.c,v 1.33 2001/08/27 03:35:58 marka Exp $ */
+/* $Id: log.c,v 1.33.2.1 2001/10/11 02:03:21 marka Exp $ */
 
 /* Principal Authors: DCL */
 
@@ -33,7 +33,7 @@ LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = {
        { "notify",     0 },
        { "database",   0 },
        { "security",   0 },
-       { "config",     0 },
+       { "_placeholder", 0 },
        { "dnssec",     0 },
        { "resolver",   0 },
        { "xfer-in",    0 },