Commit 42acdbee07 for bind
commit 42acdbee078cfa4ba1ace49355b9bee8b856c595
Author: Evan Hunt <each@isc.org>
Date: Tue Nov 17 01:43:54 2026 -0800
remove 'nodefault' from named_zone_configure()
the `nodefault` array in named_zone_configure() has been the same
as `maps` since the "effective configuration" changes in commit
07793a1bfa. failing to remove it was an oversight, now corrected.
diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index a7989ede35..9fd701c136 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -979,7 +979,6 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
dns_rdataclass_t zclass;
dns_rdataclass_t vclass;
const cfg_obj_t *maps[MAPS_SIZE];
- const cfg_obj_t *nodefault[NODEFAULT_MAPS_SIZE];
const cfg_obj_t *nooptions[NOOPTIONS_MAPS_SIZE];
const cfg_obj_t *zoptions = NULL;
const cfg_obj_t *toptions = NULL;
@@ -1025,28 +1024,27 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
zoptions = cfg_tuple_get(zconfig, "options");
INSIST(zoptions != NULL);
- nodefault[i] = nooptions[i] = maps[i] = zoptions;
+ nooptions[i] = maps[i] = zoptions;
i++;
toptions = named_zone_templateopts(config, zoptions);
if (toptions != NULL) {
- nodefault[i] = nooptions[i] = maps[i] = toptions;
+ nooptions[i] = maps[i] = toptions;
i++;
}
nooptions[i] = NULL;
if (vconfig != NULL) {
- nodefault[i] = maps[i] = cfg_tuple_get(vconfig, "options");
+ maps[i] = cfg_tuple_get(vconfig, "options");
i++;
}
(void)cfg_map_get(config, CFG_CLAUSE_OPTIONS, &options);
if (options != NULL) {
- nodefault[i] = maps[i] = options;
+ maps[i] = options;
i++;
}
- nodefault[i] = NULL;
maps[i] = NULL;
if (vconfig != NULL) {
@@ -1332,7 +1330,7 @@ named_zone_configure(const cfg_obj_t *config, const cfg_obj_t *vconfig,
}
}
notifytype = process_notifysoatype(notifytype, ztype, zname,
- nodefault);
+ maps);
if (raw != NULL) {
dns_zone_setnotifytype(raw, dns_rdatatype_soa,
dns_notifytype_no);