upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

set cfgmaps correctly

Browse source 
a typo in MR !11165 caused cfgmaps to be set with only the top-level
configuration, not the view configuration.

(cherry picked from commit 0bf2df7316)
This commit is contained in:
Evan Hunt 2025-10-29 13:28:15 -07:00
parent a85d6fb581
commit 086024fa21
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bin/named/server.c
View file

@ -4164,8 +4164,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
dns_keystorelist_t *keystores, const cfg_obj_t *bindkeys,
isc_mem_t *mctx, cfg_aclconfctx_t *actx, bool need_hints,
bool first_time) {
const cfg_obj_t *maps[4];
const cfg_obj_t *cfgmaps[3];
const cfg_obj_t *maps[4] = { 0 };
const cfg_obj_t *cfgmaps[3] = { 0 };
const cfg_obj_t *options = NULL;
const cfg_obj_t *voptions = NULL;
const cfg_obj_t *forwardtype;
@ -4200,8 +4200,8 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
bool rpz_configured = false;
bool catz_configured = false;
bool shared_cache = false;
int i = 0, j = 0, k = 0;
const char *str;
int i = 0, j = 0;
const char *str = NULL;
const char *cachename = NULL;
dns_order_t *order = NULL;
uint32_t udpsize;
@ -4239,19 +4239,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
if (vconfig != NULL) {
voptions = cfg_tuple_get(vconfig, "options");
maps[i++] = voptions;
cfgmaps[k++] = voptions;
cfgmaps[j++] = voptions;
}
if (options != NULL) {
maps[i++] = options;
}
maps[i++] = named_g_defaults;
maps[i] = NULL;
if (config != NULL) {
cfgmaps[j++] = config;
}
cfgmaps[j] = NULL;
/*
* Set the view's port number for outgoing queries.