pullup:

1113.   [bug]           The allow-update-forwarding option was ignored
                        when specified in a view. [RT #2014]

diff --git a/CHANGES b/CHANGES
index 29abec9fd68a0403b4b5f2ec1cb241245283c4c3..b35af61d0ac5a691b388b0ef628e374b561b9bcf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
 
 1114.  [port]          Ignore more accept() errors. [RT #2021]
 
+1113.  [bug]           The allow-update-forwarding option was ignored
+                       when specified in a view. [RT #2014]
+
 1111.  [bug]           Multithreaded servers could deadlock processing
                        recursive queries due to a locking hieararchy
                        violation in adb.c. [RT #2017]

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 8660c21165748b90f5b32d9ba60613ae8959e1a2..9ea1aea1048e5b178ea9b544cdc33f0622ddc7b2 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.87.2.3 2001/10/18 00:35:20 marka Exp $ */
+/* $Id: zoneconf.c,v 1.87.2.4 2001/11/13 01:15:33 gson Exp $ */
 
 #include <config.h>
 
@@ -482,7 +482,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
         */
        if (ztype == dns_zone_master) {
                dns_acl_t *updateacl;
-               RETERR(configure_zone_acl(zconfig, NULL, config,
+               RETERR(configure_zone_acl(zconfig, vconfig, config,
                                          "allow-update", ac, zone,
                                          dns_zone_setupdateacl,
                                          dns_zone_clearupdateacl));
@@ -503,7 +503,7 @@ ns_zone_configure(cfg_obj_t *config, cfg_obj_t *vconfig, cfg_obj_t *zconfig,
                dns_zone_setsigvalidityinterval(zone,
                                                cfg_obj_asuint32(obj) * 86400);
        } else if (ztype == dns_zone_slave) {
-               RETERR(configure_zone_acl(zconfig, NULL, config,
+               RETERR(configure_zone_acl(zconfig, vconfig, config,
                                          "allow-update-forwarding", ac, zone,
                                          dns_zone_setforwardacl,
                                          dns_zone_clearforwardacl));