mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-24 19:18:50 +00:00
Code Issues Releases Wiki Activity

2042. [bug] named-checkconf was incorrectly rejecting the

Browse Source 
logging category "config". [RT #16117]
This commit is contained in:
Mark Andrews 2006-06-07 02:28:28 +00:00
parent eca38a9d43
commit c55dd77de4
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,3 +1,6 @@
2042. [bug] named-checkconf was incorrectly rejecting the
logging category "config". [RT #16117]
2041. [bug] "configure --with-dlz-bdb=yes" produced a bad 2041. [bug] "configure --with-dlz-bdb=yes" produced a bad
set of libraries to be linked. [RT #16129] set of libraries to be linked. [RT #16129]

5
bin/check/Makefile.in
View File

@ -13,7 +13,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.28 2005/09/12 02:16:29 marka Exp $ # $Id: Makefile.in,v 1.29 2006/06/07 02:28:28 marka Exp $
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
@ -75,7 +75,8 @@ named-checkconf@EXEEXT@: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} \
named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \ ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
named-checkzone.@O@ check-tool.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS} named-checkzone.@O@ check-tool.@O@ ${ISCCFGLIBS} ${DNSLIBS} \
${ISCLIBS} ${LIBS}
doc man:: ${MANOBJS} doc man:: ${MANOBJS}

5
bin/check/check-tool.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: check-tool.c,v 1.24 2006/01/07 00:23:35 marka Exp $ */ /* $Id: check-tool.c,v 1.25 2006/06/07 02:28:28 marka Exp $ */
/*! \file */ /*! \file */
@ -44,6 +44,8 @@
#include <dns/types.h> #include <dns/types.h>
#include <dns/zone.h> #include <dns/zone.h>
#include <isccfg/log.h>
#ifdef HAVE_ADDRINFO #ifdef HAVE_ADDRINFO
#ifdef HAVE_GETADDRINFO #ifdef HAVE_GETADDRINFO
#ifdef HAVE_GAISTRERROR #ifdef HAVE_GAISTRERROR
@ -402,6 +404,7 @@ setup_logging(isc_mem_t *mctx, isc_log_t **logp) {
isc_log_setcontext(log); isc_log_setcontext(log);
dns_log_init(log); dns_log_init(log);
dns_log_setcontext(log); dns_log_setcontext(log);
cfg_log_init(log);
destination.file.stream = stdout; destination.file.stream = stdout;
destination.file.name = NULL; destination.file.name = NULL;

5
bin/named/log.c
View File

@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: log.c,v 1.41 2005/05/20 01:19:42 marka Exp $ */ /* $Id: log.c,v 1.42 2006/06/07 02:28:28 marka Exp $ */
/*! \file */ /*! \file */
@ -81,6 +81,9 @@ ns_log_init(isc_boolean_t safe) {
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
return (result); return (result);
/*
* named-checktool.c:setup_logging() needs to be kept in sync.
*/
isc_log_registercategories(ns_g_lctx, ns_g_categories); isc_log_registercategories(ns_g_lctx, ns_g_categories);
isc_log_registermodules(ns_g_lctx, ns_g_modules); isc_log_registermodules(ns_g_lctx, ns_g_modules);
isc_log_setcontext(ns_g_lctx); isc_log_setcontext(ns_g_lctx);