From 2e6e4cdb55ed2804c1994ebbe629f7ef064561a4 Mon Sep 17 00:00:00 2001 From: Aram Sargsyan Date: Tue, 9 Jul 2024 10:41:19 +0000 Subject: [PATCH] Non empty 'catalog-zones' implies that 'allow-new-zones' is true This condition in catalog zone processing functions is checked only for sanity, so there is no meaning for a log message that normally shouldn't be ever logged. (cherry picked from commit 0b3c8ee55e6cda1f2de35aa15f6a4d82d072c309) --- bin/named/server.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/bin/named/server.c b/bin/named/server.c index 471793418e..dd0b859cfd 100644 --- a/bin/named/server.c +++ b/bin/named/server.c @@ -2682,13 +2682,13 @@ catz_addmodzone_taskaction(isc_task_t *task, isc_event_t *event0) { ns_cfgctx_t *cfg; dns_zone_t *zone = NULL; + /* + * A non-empty 'catalog-zones' statement implies that 'allow-new-zones' + * is true, so this is expected to be non-NULL. + */ cfg = (ns_cfgctx_t *)ev->view->new_zone_config; if (cfg == NULL) { - isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, - NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, - "catz: allow-new-zones statement missing from " - "config; cannot add zone from the catalog"); - goto cleanup; + CHECK(ISC_R_FAILURE); } name = dns_catz_entry_getname(ev->entry); @@ -3058,14 +3058,13 @@ catz_reconfigure(dns_catz_entry_t *entry, dns_view_t *view, return; } + /* + * A non-empty 'catalog-zones' statement implies that 'allow-new-zones' + * is true, so this is expected to be non-NULL. + */ cfg = (ns_cfgctx_t *)view->new_zone_config; if (cfg == NULL) { - isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, - NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR, - "catz_reconfigure: allow-new-zones statement " - "missing from config; cannot reconfigure a " - "member zone"); - goto cleanup; + CHECK(ISC_R_FAILURE); } result = dns_catz_generate_zonecfg(data->catz, entry, &confbuf);