pullup:

1018.   [bug]           The default log channel was not always initialized
                        correctly. [RT #1813]

diff --git a/CHANGES b/CHANGES
index ed7bf182931e421fdf2ec7f38088379a247df022..9d41733ef73f770baf553d781748b953a487242b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 1019.  [bug]           The value of the lame-ttl option was limited to 18000
                        seconds, not 1800 seconds as documented. [RT #1803]
 
+1018.  [bug]           The default log channel was not always initialized
+                       correctly. [RT #1813]
+
 1017.  [bug]           When specifying TSIG keys to dig and nsupdate using
                        the -k option, they must be HMAC-MD5 keys.  [RT #1810]
 

diff --git a/bin/named/logconf.c b/bin/named/logconf.c
index 4639d7230f2776d0e774041dfb8f46eeca42ce66..8d568b8683d3f0a4693891a37b016b31ea586de7 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.1 2001/09/26 02:52:09 marka Exp $ */
+/* $Id: logconf.c,v 1.30.2.2 2001/09/28 18:35:02 bwelling Exp $ */
 
 #include <config.h>
 
@@ -267,12 +267,12 @@ ns_log_configure(isc_logconfig_t *logconf, cfg_obj_t *logstmt) {
                CHECK(category_fromconf(category, logconf));
                if (!default_set) {
                        cfg_obj_t *catname = cfg_tuple_get(category, "name");
-                       if (strcmp(cfg_obj_asstring(catname), "default"))
+                       if (strcmp(cfg_obj_asstring(catname), "default") == 0)
                                default_set = ISC_TRUE;
                }
                if (!unmatched_set) {
                        cfg_obj_t *catname = cfg_tuple_get(category, "name");
-                       if (strcmp(cfg_obj_asstring(catname), "unmatched"))
+                       if (strcmp(cfg_obj_asstring(catname), "unmatched") == 0)
                                unmatched_set = ISC_TRUE;
                }
        }