upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 08:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

apply_configuration: bump config map before exclusive mode

Browse source 
Moving the config map building outside of the exclusive mode, and this
is local data only and no runtime object uses it.
This commit is contained in:
Colin Vidal 2025-09-08 11:07:29 +02:00
parent de11150e47
commit 4523852ded
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bin/named/server.c
View file

@ -8141,6 +8141,18 @@ apply_configuration(cfg_parser_t *configparser, cfg_obj_t *config,
ISC_LIST_INIT(cachelist);
ISC_LIST_INIT(altsecrets);
/*
* Fill in the maps array, used for resolving defaults.
*/
i = 0;
options = NULL;
result = cfg_map_get(config, "options", &options);
if (result == ISC_R_SUCCESS) {
maps[i++] = options;
}
maps[i++] = named_g_defaultoptions;
maps[i] = NULL;
/* Ensure exclusive access to configuration data. */
isc_loopmgr_pause();
@ -8187,18 +8199,6 @@ apply_configuration(cfg_parser_t *configparser, cfg_obj_t *config,
dns_zonemgr_set_tlsctx_cache(server->zonemgr,
server->tlsctx_client_cache);
/*
* Fill in the maps array, used for resolving defaults.
*/
i = 0;
options = NULL;
result = cfg_map_get(config, "options", &options);
if (result == ISC_R_SUCCESS) {
maps[i++] = options;
}
maps[i++] = named_g_defaultoptions;
maps[i] = NULL;
#if HAVE_LIBNGHTTP2
obj = NULL;
result = named_config_get(maps, "http-port", &obj);