diff --git a/CHANGES b/CHANGES index 8aee273d68..b2bcd033a0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +3899. [bug] "request-ixfr" is only applicable to slave and redirect + zones. [RT #36608] + 3898. [bug] Too small a buffer in tohexstr() calls in test code. [RT #36598] diff --git a/bin/tests/system/checkconf/bad-master-request-ixfr.conf b/bin/tests/system/checkconf/bad-master-request-ixfr.conf new file mode 100644 index 0000000000..0a8c9baeba --- /dev/null +++ b/bin/tests/system/checkconf/bad-master-request-ixfr.conf @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* + * request-ixfr clause is not allowed in zone of type master. + */ + +zone dummy { + type master; + request-ixfr no; + file "xxxx"; +}; diff --git a/bin/tests/system/ixfr/ns3/named.conf b/bin/tests/system/ixfr/ns3/named.conf index 5edba116ff..11c482dfe8 100644 --- a/bin/tests/system/ixfr/ns3/named.conf +++ b/bin/tests/system/ixfr/ns3/named.conf @@ -48,7 +48,6 @@ view "primary" { zone "sub.test" IN { type master; file "subtest.db"; - request-ixfr no; }; zone "large" IN { type master; diff --git a/lib/bind9/check.c b/lib/bind9/check.c index 086c35bc3d..0e81401232 100644 --- a/lib/bind9/check.c +++ b/lib/bind9/check.c @@ -1513,6 +1513,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions, { "notify-source", MASTERZONE | SLAVEZONE }, { "notify-source-v6", MASTERZONE | SLAVEZONE }, { "pubkey", MASTERZONE | SLAVEZONE | STUBZONE }, + { "request-ixfr", SLAVEZONE | REDIRECTZONE }, { "server-addresses", STATICSTUBZONE }, { "server-names", STATICSTUBZONE }, { "sig-re-signing-interval", MASTERZONE | SLAVEZONE },