pullup:

 335.   [bug]           named would occasionally attempt recursion when
                        it was disallowed or undesired.

diff --git a/CHANGES b/CHANGES
index 3f236e4a36aa4cb056c832bda853eec00adc9e00..45a2942054ad529405b0bf111e10d8dfa14a90d2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 335.  [bug]           named would occasionally attempt recursion when
+                       it was disallowed or undesired.
+
  333.  [bug]           The resolver incorrectly accepted referrals to
                        domains that were not parents of the query name,
                        causing assertion failures.

diff --git a/bin/named/client.c b/bin/named/client.c
index 9dba9ef79a01d94ca98ad3bc853dd5e76df2442d..a4eeb13dc2b13cd98157590a5593a5be99b5a48b 100644 (file)
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: client.c,v 1.98.2.1 2000/07/17 17:30:11 gson Exp $ */
+/* $Id: client.c,v 1.98.2.2 2000/07/17 18:56:03 gson Exp $ */
 
 #include <config.h>
 
@@ -1053,6 +1053,8 @@ client_request(isc_task_t *task, isc_event_t *event) {
 
        if (ra == ISC_TRUE)
                client->attributes |= NS_CLIENTATTR_RA;
+       else
+               client->attributes &= ~NS_CLIENTATTR_RA;
 
        /*
         * Dispatch the request.