mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 14:35:26 +00:00
Code Issues Releases Wiki Activity

Non empty 'catalog-zones' implies that 'allow-new-zones' is true

Browse Source 
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.
This commit is contained in:
Aram Sargsyan
2024-07-09 10:41:19 +00:00
committed by Petr Špaček
parent 730fd32ee6
commit d197c583dd
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bin/named/server.c
View File

@@ -2689,13 +2689,13 @@ catz_addmodzone_cb(void *arg) {
goto cleanup;
}
/*
* 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 *)cz->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(cz->entry);
@@ -3067,14 +3067,13 @@ catz_reconfigure(dns_catz_entry_t *entry, void *arg1, void *arg2) {
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);