diff --git a/CHANGES b/CHANGES index 829bb8dd55..e26dda0fa2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +3363. [bug] Need to allow "forward" and "fowarders" options + in static-stub zones; this had been overlooked. + [RT #30482] + 3362. [bug] Setting some option values to 0 in named.conf could trigger an assertion failure on startup. [RT #27730] diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf index 711da3e859..ffa1428aac 100644 --- a/bin/tests/system/checkconf/good.conf +++ b/bin/tests/system/checkconf/good.conf @@ -88,6 +88,13 @@ view "second" { file "yyy"; update-policy local; }; + zone "example2" { + type static-stub; + forward only; + forwarders { + 10.53.0.4; + }; + }; dnssec-lookaside "." trust-anchor "dlv.isc.org."; dnssec-validation auto; }; diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 277e9b3a1b..e16c21d06a 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -1347,8 +1347,10 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, { "also-notify", MASTERZONE | SLAVEZONE }, { "dialup", MASTERZONE | SLAVEZONE | STUBZONE | STREDIRECTZONE }, { "delegation-only", HINTZONE | STUBZONE | DELEGATIONZONE }, - { "forward", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE }, - { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE }, + { "forward", MASTERZONE | SLAVEZONE | STUBZONE | + STATICSTUBZONE | FORWARDZONE }, + { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | + STATICSTUBZONE | FORWARDZONE }, { "maintain-ixfr-base", MASTERZONE | SLAVEZONE | STREDIRECTZONE }, { "max-ixfr-log-size", MASTERZONE | SLAVEZONE | STREDIRECTZONE }, { "notify-source", MASTERZONE | SLAVEZONE },