From: Mark Andrews <marka@isc.org>
Date: Tue, 16 May 2006 03:35:56 +0000 (+0000)
Subject: 2017.   [bug]           allow-query default was net correct. [RT #15946]
X-Git-Tag: v9.4.0b1~36^2~82
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7b68fa6229f1edadac44c7ec459c9ed77a8368c8;p=thirdparty%2Fbind9.git

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

diff --git a/CHANGES b/CHANGES
index 499a754055c..2d333abdc5d 100644
--- 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 d7cb752f74a..4866374a837 100644
--- a/bin/named/zoneconf.c
+++ b/bin/named/zoneconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zoneconf.c,v 1.132 2006/03/06 01:27:52 marka Exp $ */
+/* $Id: zoneconf.c,v 1.133 2006/05/16 03:35:56 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);