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

Fix a bug in configure_catz_zone()

Browse Source 
When dns_catz_zone_add() returns ISC_R_EXISTS and there is no
'default-primaries' or 'default-masters', the ISC_R_EXISTS result
code doesn't get reset to ISC_R_SUCCESS, and the function returns
ISC_R_EXISTS instead of ISC_R_SUCCESS. Which means that the zone
is successfully added, but the caller assumes that the function has
failed.

Reset 'result' to ISC_R_SUCCESS when dns_catz_zone_add() returns
ISC_R_EXISTS (it's not an error condition).

Refactor the code go call dns_catz_zone_add() when all other error
conditions are already checked.
This commit is contained in:
Aram Sargsyan
2025-08-26 14:58:32 +00:00
committed by Arаm Sаrgsyаn
parent 6a76b143a7
commit db36ae47d2
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bin/named/server.c
View File

@@ -2793,9 +2793,11 @@ configure_catz_zone(dns_view_t *view, dns_view_t *pview,
const char *str; const char *str;
isc_result_t result; isc_result_t result;
dns_name_t origin; dns_name_t origin;
dns_ipkeylist_t ipkl;
dns_catz_options_t *opts; dns_catz_options_t *opts;
dns_name_init(&origin); dns_name_init(&origin);
dns_ipkeylist_init(&ipkl);
catz_obj = cfg_listelt_value(element); catz_obj = cfg_listelt_value(element);
str = cfg_obj_asstring(cfg_tuple_get(catz_obj, "zone name")); str = cfg_obj_asstring(cfg_tuple_get(catz_obj, "zone name"));
@@ -2812,6 +2814,21 @@ configure_catz_zone(dns_view_t *view, dns_view_t *pview,
goto cleanup; goto cleanup;
} }
obj = cfg_tuple_get(catz_obj, "default-masters");
if (obj == NULL || !cfg_obj_istuple(obj)) {
obj = cfg_tuple_get(catz_obj, "default-primaries");
}
if (obj != NULL && cfg_obj_istuple(obj)) {
result = named_config_getipandkeylist(config, obj, view->mctx,
&ipkl);
if (result != ISC_R_SUCCESS) {
cfg_obj_log(catz_obj, DNS_CATZ_ERROR_LEVEL,
"catz: default-primaries parse error: %s",
isc_result_totext(result));
goto cleanup;
}
}
result = dns_catz_zone_add(view->catzs, &origin, &zone); result = dns_catz_zone_add(view->catzs, &origin, &zone);
if (result == ISC_R_EXISTS) { if (result == ISC_R_EXISTS) {
catz_reconfig_data_t data = { catz_reconfig_data_t data = {
@@ -2829,18 +2846,24 @@ configure_catz_zone(dns_view_t *view, dns_view_t *pview,
view); view);
dns_catz_zone_for_each_entry2(zone, catz_reconfigure, view, dns_catz_zone_for_each_entry2(zone, catz_reconfigure, view,
&data); &data);
result = ISC_R_SUCCESS;
} else if (result != ISC_R_SUCCESS) {
cfg_obj_log(catz_obj, DNS_CATZ_ERROR_LEVEL,
"catz: dns_catz_zone_add failed: %s",
isc_result_totext(result));
goto cleanup;
} }
dns_catz_zone_resetdefoptions(zone); dns_catz_zone_resetdefoptions(zone);
opts = dns_catz_zone_getdefoptions(zone); opts = dns_catz_zone_getdefoptions(zone);
if (ipkl.count != 0) {
obj = cfg_tuple_get(catz_obj, "default-masters"); /*
if (obj == NULL || !cfg_obj_istuple(obj)) { * Transfer the ownership of the pointers inside 'ipkl' and
obj = cfg_tuple_get(catz_obj, "default-primaries"); * set its count to 0 in order to not cleanup it later below.
} */
if (obj != NULL && cfg_obj_istuple(obj)) { opts->masters = ipkl;
result = named_config_getipandkeylist(config, obj, view->mctx, ipkl.count = 0;
&opts->masters);
} }
obj = cfg_tuple_get(catz_obj, "in-memory"); obj = cfg_tuple_get(catz_obj, "in-memory");
@@ -2869,6 +2892,9 @@ configure_catz_zone(dns_view_t *view, dns_view_t *pview,
cleanup: cleanup:
dns_name_free(&origin, view->mctx); dns_name_free(&origin, view->mctx);
if (ipkl.count != 0) {
dns_ipkeylist_clear(view->mctx, &ipkl);
}
return result; return result;
} }