2057. [bug] Make setting "ra" dependent on both allow-query and

                        allow-recursion. [RT #16290]

diff --git a/CHANGES b/CHANGES
index 9b94492f34eea54d50748656e2f5f08a123e85c5..801224127cf26bb710f02b08b13e07eb157a2177 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2057.  [bug]           Make setting "ra" dependent on both allow-query and
+                       allow-recursion. [RT #16290]
+
 2056.  [bug]           dig: ixfr= was not being treated case insensitively
                        at all times. [RT #15955]
 

diff --git a/bin/named/client.c b/bin/named/client.c
index 1528d8ff2fa8001ab458cabd08adf7fad5ba62b4..e2fef58462caf102ed80c1b78d1188415ffec1dc 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.176.2.23 2006/07/21 23:44:36 marka Exp $ */
+/* $Id: client.c,v 1.176.2.24 2006/07/22 01:09:04 marka Exp $ */
 
 #include <config.h>
 
@@ -1501,7 +1501,9 @@ client_request(isc_task_t *task, isc_event_t *event) {
            /* XXX this will log too much too early */
            ns_client_checkacl(client, "recursion available:",
                               client->view->recursionacl,
-                              ISC_TRUE, ISC_LOG_DEBUG(1)) == ISC_R_SUCCESS)
+                              ISC_TRUE, ISC_LOG_DEBUG(1)) == ISC_R_SUCCESS &&
+           ns_client_checkaclsilent(client, client->view->queryacl,
+                                    ISC_TRUE) == ISC_R_SUCCESS)
                ra = ISC_TRUE;
 
        if (ra == ISC_TRUE)