call ns_log_init so that the categories there are registered

diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index 23d32a1d109a03c2d5d3bbb0e31654a751be891b..54866b748d7044e13094aa2d6556d7a9735f7eda 100644 (file)
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -23,11 +23,13 @@ ISCCFGLIBS =        ../../lib/isccfg/libisccfg.@A@
 ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@
 BIND9LIBS =    ../../lib/bind9/libbind9.@A@
+NSLIBS =       ../../lib/ns/libns.@A@
 
 DNSDEPLIBS =   ../../lib/dns/libdns.@A@
 ISCCFGDEPLIBS =        ../../lib/isccfg/libisccfg.@A@
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
+NSDEPENDLIBS = ../../lib/ns/libns.@A@
 
 LIBS =         ${ISCLIBS} @LIBS@
 NOSYMLIBS =    ${ISCNOSYMLIBS} @LIBS@
@@ -59,14 +61,15 @@ named-checkzone.@O@: named-checkzone.c
                -c ${srcdir}/named-checkzone.c
 
 named-checkconf@EXEEXT@: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} \
-               ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
+               ${NSDEPENDLIBS} ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
        export BASEOBJS="named-checkconf.@O@ check-tool.@O@"; \
-       export LIBS0="${BIND9LIBS} ${ISCCFGLIBS} ${DNSLIBS}"; \
+       export LIBS0="${NSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${DNSLIBS}"; \
        ${FINALBUILDCMD}
 
-named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} \
+               ${NSDEPENDLIBS} ${DNSDEPLIBS}
        export BASEOBJS="named-checkzone.@O@ check-tool.@O@"; \
-       export LIBS0="${ISCCFGLIBS} ${DNSLIBS}"; \
+       export LIBS0="${NSLIBS} ${ISCCFGLIBS} ${DNSLIBS}"; \
        ${FINALBUILDCMD}
 
 doc man:: ${MANOBJS}

diff --git a/bin/check/check-tool.c b/bin/check/check-tool.c
index 1c00a4a0c2c1b2124c11b458bcf4a35c3ab6aa73..62377b5c432b9dcdb0065dff0995018267403790 100644 (file)
--- a/bin/check/check-tool.c
+++ b/bin/check/check-tool.c
@@ -48,6 +48,8 @@
 
 #include <isccfg/log.h>
 
+#include <ns/log.h>
+
 #ifndef CHECK_SIBLING
 #define CHECK_SIBLING 1
 #endif
@@ -112,13 +114,7 @@ unsigned int zone_options2 = 0;
  */
 static isc_logcategory_t categories[] = {
        { "",                0 },
-       { "client",          0 },
-       { "network",         0 },
-       { "update",          0 },
-       { "queries",         0 },
        { "unmatched",       0 },
-       { "update-security", 0 },
-       { "query-errors",    0 },
        { NULL,              0 }
 };
 
@@ -562,6 +558,7 @@ setup_logging(isc_mem_t *mctx, FILE *errout, isc_log_t **logp) {
        dns_log_init(log);
        dns_log_setcontext(log);
        cfg_log_init(log);
+       ns_log_init(log);
 
        destination.file.stream = errout;
        destination.file.name = NULL;