diff --git a/CHANGES b/CHANGES index 6224325cdd..5bb07ef942 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ + + 676. [bug] Log messages about lame servers to category + 'lame-servers' rather than 'resolver', so as not + to be gratuitously incompatible with BIND 8. + 675. [func] TKEY queries could cause the server to leak memory. diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h index ae7b18be67..076b52c0da 100644 --- 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.27 2001/01/09 21:52:59 bwelling Exp $ */ +/* $Id: log.h,v 1.28 2001/01/11 19:38:11 gson Exp $ */ /* Principal Authors: DCL */ @@ -38,6 +38,7 @@ extern isc_logmodule_t dns_modules[]; #define DNS_LOGCATEGORY_XFER_IN (&dns_categories[6]) #define DNS_LOGCATEGORY_XFER_OUT (&dns_categories[7]) #define DNS_LOGCATEGORY_DISPATCH (&dns_categories[8]) +#define DNS_LOGCATEGORY_LAME_SERVERS (&dns_categories[9]) /* Backwards compatibility. */ #define DNS_LOGCATEGORY_GENERAL ISC_LOGCATEGORY_GENERAL diff --git a/lib/dns/log.c b/lib/dns/log.c index 3b28e0967f..192b3dfb1f 100644 --- 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.30 2001/01/09 21:50:59 bwelling Exp $ */ +/* $Id: log.c,v 1.31 2001/01/11 19:38:08 gson Exp $ */ /* Principal Authors: DCL */ @@ -39,6 +39,7 @@ isc_logcategory_t dns_categories[] = { { "xfer-in", 0 }, { "xfer-out", 0 }, { "dispatch", 0 }, + { "lame-servers", 0 }, { NULL, 0 } }; diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 3d19f63aec..917b4244a2 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.194 2001/01/09 21:51:28 bwelling Exp $ */ +/* $Id: resolver.c,v 1.195 2001/01/11 19:38:10 gson Exp $ */ #include @@ -2260,7 +2260,7 @@ log_lame(fetchctx_t *fctx, dns_adbaddrinfo_t *addrinfo) { dns_name_format(&fctx->name, namebuf, sizeof(namebuf)); dns_name_format(&fctx->domain, domainbuf, sizeof(domainbuf)); isc_sockaddr_format(&addrinfo->sockaddr, addrbuf, sizeof(addrbuf)); - isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER, + isc_log_write(dns_lctx, DNS_LOGCATEGORY_LAME_SERVERS, DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO, "lame server on '%s' (in '%s'?): %s", namebuf, domainbuf, addrbuf);