3899. [bug] "request-ixfr" is only applicable to slave and redirect

                        zones. [RT #36608]

Conflicts:
	CHANGES

diff --git a/CHANGES b/CHANGES
index 2c31688370f76ffe568c61b7b3f6f742fc4aefc5..2bf2a6fc28e6f8bf8fc36b553466e5fae16fc80f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
-3898.  [bug]           To small a buffer in tohexstr() calls in test code.
+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]
 
 3897.  [bug]           RPZ summary information was not properly being updated

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 (file)
index 0000000..0a8c9ba
--- /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 5edba116ffd143b299778c82ea42ec09e863043e..11c482dfe8aa6a21122bba937f5024ddd53414a2 100644 (file)
--- 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 91ceb6f74cc133ce4a6d8e948efbbd416d523462..a4a5b356e1bacf6cc6b89f8e1665c016f36d0496 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1480,6 +1480,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 },