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

ensure rndc modzone succeeds twice for a zone in named.conf

Browse source 
If a zone is in named.conf, not originally added by rndc addzone,
rndc modzone for that zone succeeds once, but subsequent modzone
attempts fail. This is because do_modzone removes the zone config
from global or view options, but it would fail due to 'not found'
once the config is removed.

The fix is to ensure re-adding the updated zone config to the
global or view options. This also works as a more complete fix
for the issue 85453d3 atempted to solve, ensuring rndc showzone
shows the latest config: it now works for multple attemps of
modzone, and with named that is not built with LMDB.

The change in this commit relies on UNCONST in a few places.
That's not clean, but 'add/mod/delzone' generally seems to
need it (for example, delete_zoneconf uses it to modify the list
of zones). In that sense, this change follows the convention
(for a longer term, there may have to be a better API so that we
can modify config obtions that were once parsed).

(cherry picked from commit f2115e9d58)
This commit is contained in:
JINMEI Tatuya 2026-03-23 09:58:39 -07:00 committed by Matthijs Mekking
parent c6a691b57b
commit fb2267ad99
2 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bin/named/server.c
View file

@ -14269,9 +14269,11 @@ do_modzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view,
bool added;
bool exclusive = false;
bool locked = false;
const cfg_obj_t *options = NULL;
cfg_obj_t *z;
cfg_obj_t *o;
#ifndef HAVE_LMDB
FILE *fp = NULL;
cfg_obj_t *z;
#else /* HAVE_LMDB */
MDB_txn *txn = NULL;
MDB_dbi dbi;
@ -14377,17 +14379,13 @@ do_modzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view,
if (!added) {
if (cfg->vconfig == NULL) {
result = delete_zoneconf(
view, cfg->conf_parser, cfg->config,
dns_zone_getorigin(zone), NULL, locked);
options = cfg->config;
} else {
const cfg_obj_t *voptions = cfg_tuple_get(cfg->vconfig,
"options");
result = delete_zoneconf(
view, cfg->conf_parser, voptions,
dns_zone_getorigin(zone), NULL, locked);
options = cfg_tuple_get(cfg->vconfig, "options");
}
result = delete_zoneconf(view, cfg->conf_parser, options,
dns_zone_getorigin(zone), NULL,
locked);
if (result != ISC_R_SUCCESS) {
TCHECK(putstr(text, "former zone configuration "
"not deleted: "));
@ -14458,6 +14456,10 @@ do_modzone(named_server_t *server, ns_cfgctx_t *cfg, dns_view_t *view,
TCHECK(putstr(text, zname));
TCHECK(putstr(text, "' reconfigured."));
} else {
DE_CONST(zoneobj, z);
DE_CONST(options, o);
CHECK(cfg_parser_mapadd(cfg->conf_parser, o, z, "zone"));
TCHECK(putstr(text, "zone '"));
TCHECK(putstr(text, zname));
TCHECK(putstr(text, "' must also be reconfigured in\n"));

19
bin/tests/system/addzone/tests_rndc_modzone_without_add.py
View file

@ -35,3 +35,22 @@ def test_rndc_modzone_without_add(ns3):
raise_on_exception=False,
)
assert cmd.rc == 0
# Confirm that the modzone took effect in 'rndc showzone'.
cmd = ns3.rndc("showzone .", raise_on_exception=False)
assert cmd.rc == 0
assert 'allow-query { "none"; }' in cmd.out
# Confirm that 'rndc modzone' still works after the first modzone.
# This was not the case before as the zone config was incorrectly
# removed in-memory after the first modzone.
cmd = ns3.rndc(
'modzone . {type primary; file "redirect.db"; allow-query {any;};};',
raise_on_exception=False,
)
assert cmd.rc == 0
# Confirm that the second modzone took effect in 'rndc showzone'.
cmd = ns3.rndc("showzone .", raise_on_exception=False)
assert cmd.rc == 0
assert 'allow-query { "any"; }' in cmd.out