diff --git a/lib/dns/log.c b/lib/dns/log.c index b79051f6a9..749771b864 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.26 2000/08/01 01:22:28 tale Exp $ */ +/* $Id: log.c,v 1.27 2000/09/26 22:10:44 bwelling Exp $ */ /* Principal Authors: DCL */ @@ -84,7 +84,5 @@ dns_log_init(isc_log_t *lctx) { void dns_log_setcontext(isc_log_t *lctx) { - REQUIRE(dns_lctx == NULL); - dns_lctx = lctx; } diff --git a/lib/isc/log.c b/lib/isc/log.c index e92636fc17..daf0c61808 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: log.c,v 1.46 2000/08/31 20:58:14 bwelling Exp $ */ +/* $Id: log.c,v 1.47 2000/09/26 22:10:22 bwelling Exp $ */ /* Principal Authors: DCL */ @@ -853,8 +853,6 @@ isc_log_vwrite1(isc_log_t *lctx, isc_logcategory_t *category, void isc_log_setcontext(isc_log_t *lctx) { - REQUIRE(isc_lctx == NULL); - isc_lctx = lctx; } @@ -1218,7 +1216,7 @@ isc_log_wouldlog(isc_log_t *lctx, int level) { * dynamically changed. */ - if (lctx == NULL) + if (lctx == NULL || lctx->logconfig == NULL) return (ISC_FALSE); return (ISC_TF(level <= lctx->logconfig->highest_level ||