1291. [bug] "recursion available: {denied,approved}" was too

                        confusing.

diff --git a/CHANGES b/CHANGES
index 9fe20a17ba9b30eb3c197dab185c8352f398d1d2..0cdc9e7615bd5775f16bb8f66de46c4963ef4ccb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1291.  [bug]           "recursion available: {denied,approved}" was too
+                       confusing.
+
 1290.  [bug]           Check that system inet_pton() and inet_ntop() support
                        AF_INET6.
 

diff --git a/bin/named/client.c b/bin/named/client.c
index 31ca5ba4a47e9221ca047b218ee2dcf909d91e37..30c21c86565cc4d1933e0887e719bd0dc32e196a 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.208 2002/04/29 23:43:46 marka Exp $ */
+/* $Id: client.c,v 1.209 2002/05/16 04:05:42 marka Exp $ */
 
 #include <config.h>
 
@@ -1463,15 +1463,17 @@ client_request(isc_task_t *task, isc_event_t *event) {
        ra = ISC_FALSE;
        if (client->view->resolver != NULL &&
            client->view->recursion == ISC_TRUE &&
-           /* 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)
+           ns_client_checkaclsilent(client, client->view->recursionacl,
+                                    ISC_TRUE) == ISC_R_SUCCESS)
                ra = ISC_TRUE;
 
        if (ra == ISC_TRUE)
                client->attributes |= NS_CLIENTATTR_RA;
 
+       ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT,
+                     ISC_LOG_DEBUG(3), ra ? "recursion available" :
+                                            "recursion not available");
+
        /*
         * Dispatch the request.
         */