pullup:

375.	[bug]		Per-zone allow-query did not properly override the
			view/global one for CNAME targets and additional
			data [RT #220].

diff --git a/CHANGES b/CHANGES
index f19639ff5d2add187be77a8d0db9f1043381a833..7a70dcf1513b05f56cf8121c94107ff1b495d79b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 375.  [bug]           Per-zone allow-query did not properly override the
+                       view/global one for CNAME targets and additional
+                       data [RT #220].
 
        --- 9.0.0rc2 released ---
 

diff --git a/bin/named/query.c b/bin/named/query.c
index a5fe9aacd12531ae6a4b7a81a5f3555712b95e74..acf1e95fdbe1f7c7054651441f0945c45e5062ef 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: query.c,v 1.109.2.8 2000/08/08 01:10:25 gson Exp $ */
+/* $Id: query.c,v 1.109.2.9 2000/08/08 17:52:09 bwelling Exp $ */
 
 #include <config.h>
 
@@ -485,7 +485,6 @@ query_getzonedb(ns_client_t *client, dns_name_t *name, unsigned int options,
                return (DNS_R_SERVFAIL);
        *versionp = dbversion->version;
        if (new_zone) {
-               queryacl = dns_zone_getqueryacl(*zonep);
                check_acl = ISC_TRUE;
        } else if (!dbversion->queryok) {
                return (DNS_R_REFUSED);
@@ -493,6 +492,7 @@ query_getzonedb(ns_client_t *client, dns_name_t *name, unsigned int options,
                check_acl = ISC_FALSE;
        }
 
+       queryacl = dns_zone_getqueryacl(*zonep);
        if (queryacl == NULL) {
                queryacl = client->view->queryacl;
                if ((client->query.attributes &