954. [bug] dig, host, nslookup: AXFR / IXFR are inherently

                        non-recursive, do not set RD.  [RT #1575]

diff --git a/CHANGES b/CHANGES
index 0e5eec6925aab824a2cc972db9cca950be5e2776..2f4c6f77b9bfb4b1347870aa031a5f66969fe121 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 954.  [bug]           dig, host, nslookup: AXFR / IXFR are inherently
+                       non-recursive, do not set RD.  [RT #1575]
+
  953.  [func]          named.key from change #843 has been replaced by
                        /etc/rndc.key.  Both named and rndc will look for
                        this file and associated key if they are not already

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index c71f7290d45e094ceece102c95efb35f55bdc9eb..50bbb54a261ff4d2861471821941c66efd952f74 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.219 2001/07/30 01:09:13 marka Exp $ */
+/* $Id: dighost.c,v 1.220 2001/08/06 05:50:20 marka Exp $ */
 
 /*
  * Notice to programmers:  Do not use this code as an example of how to
@@ -1308,7 +1308,9 @@ setup_lookup(dig_lookup_t *lookup) {
        if (lookup->trace || (lookup->ns_search_only && !lookup->trace_root))
                lookup->recurse = ISC_FALSE;
 
-       if (lookup->recurse) {
+       if (lookup->recurse &&
+           lookup->rdtype != dns_rdatatype_axfr &&
+           lookup->rdtype != dns_rdatatype_ixfr) {
                debug("recursive query");
                lookup->sendmsg->flags |= DNS_MESSAGEFLAG_RD;
        }