I1965. [func] Suppress spurious "recusion requested but not

                        available" warning with 'dig +qr'. [RT #15780].

diff --git a/CHANGES b/CHANGES
index ef29e7d965c7ab9c53b31837898d5f2a0da58a6b..702615242b3db5869abeed9685cc63d8006a9238 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1965.  [func]          Suppress spurious "recusion requested but not
+                       available" warning with 'dig +qr'. [RT #15780].
+
 1964.  [func]          Seperate out MX and SRV to CNAME checks. [RT #15723]
 
 1963.  [port]          Tru64 4.0E doesn't support send() and recv(). 

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 4f1db0f3c5a13bc577e05c23b9c5903fc2688f45..1b42785afdbe999963436e9bc3d35470529ae128 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.208 2005/10/14 01:14:06 marka Exp $ */
+/* $Id: dig.c,v 1.209 2006/01/06 00:13:30 marka Exp $ */
 
 /*! \file */
 
@@ -491,7 +491,8 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
                               msg->counts[DNS_SECTION_AUTHORITY],
                               msg->counts[DNS_SECTION_ADDITIONAL]);
 
-                       if ((msg->flags & DNS_MESSAGEFLAG_RD) != 0 &&
+                       if (msg != query->lookup->sendmsg &&
+                           (msg->flags & DNS_MESSAGEFLAG_RD) != 0 &&
                            (msg->flags & DNS_MESSAGEFLAG_RA) == 0)
                                printf(";; WARNING: recusion requested "
                                       "but not available\n");