2017. [bug] allow-query default was net correct. [RT #15946]

diff --git a/CHANGES b/CHANGES
index e733060f7a3e6b03d3bb616cf04dfb2f4c7dfe2a..652059101689645caa53fca8bfb46c440676da00 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2017.  [bug]           allow-query default was net correct. [RT #15946]
+
 2016.  [bug]           Return a partial answer if recursion is not
                        allowed but requested and we had the answer
                        to the original qname. [RT #15945]

diff --git a/bin/named/zoneconf.c b/bin/named/zoneconf.c
index 3ade645307c476ed01b8a97f1da827ae539895db..a0c1babd6d0e3836c5627c7425296131b81e9e74 100644 (file)
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.110.18.22 2006/03/06 01:38:00 marka Exp $ */
+/* $Id: zoneconf.c,v 1.110.18.23 2006/05/16 03:39:57 marka Exp $ */
 
 /*% */
 
@@ -65,7 +65,7 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig,
                   void (*clearzacl)(dns_zone_t *))
 {
        isc_result_t result;
-       const cfg_obj_t *maps[4];
+       const cfg_obj_t *maps[5];
        const cfg_obj_t *aclobj = NULL;
        int i = 0;
        dns_acl_t *dacl = NULL;
@@ -80,6 +80,7 @@ configure_zone_acl(const cfg_obj_t *zconfig, const cfg_obj_t *vconfig,
                if (options != NULL)
                        maps[i++] = options;
        }
+       maps[i++] = ns_g_defaults;
        maps[i] = NULL;
 
        result = ns_config_get(maps, aclname, &aclobj);