2606. [bug] "delegation-only" was not being accepted in

                        delegation-only type zones. [RT #19717]

diff --git a/CHANGES b/CHANGES
index 2527c85121530165cf42210eb19dd012e2487873..1bf812e52c8b77ce1147bbc723b60a2c2a86e7cb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2606.  [bug]           "delegation-only" was not being accepted in
+                       delegation-only type zones. [RT #19717]
+
 2605.  [bug]           Accept DS responses from delegation only zones.
                        [RT # 19296]
 

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 800cbf9bcdb34ca9a547e7e8246756a0bc46edaf..753db9ce113f978d3334f53731b96ffa2da5e9ed 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: check.c,v 1.95.12.3 2009/02/17 03:43:07 marka Exp $ */
+/* $Id: check.c,v 1.95.12.4 2009/06/03 00:06:01 marka Exp $ */
 
 /*! \file */
 
@@ -1050,9 +1050,9 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
        { "notify", MASTERZONE | SLAVEZONE },
        { "also-notify", MASTERZONE | SLAVEZONE },
        { "dialup", MASTERZONE | SLAVEZONE | STUBZONE },
-       { "delegation-only", HINTZONE | STUBZONE },
-       { "forward", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE},
-       { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE},
+       { "delegation-only", HINTZONE | STUBZONE | DELEGATIONZONE },
+       { "forward", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE },
+       { "forwarders", MASTERZONE | SLAVEZONE | STUBZONE | FORWARDZONE },
        { "maintain-ixfr-base", MASTERZONE | SLAVEZONE },
        { "max-ixfr-log-size", MASTERZONE | SLAVEZONE },
        { "notify-source", MASTERZONE | SLAVEZONE },