From 9a33e2d135b0de7d2e2d768f2b9c45b2627fe4e6 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 6 Jan 2006 00:13:30 +0000
Subject: [PATCH] I1965.   [func]          Suppress spurious "recusion
 requested but not                         available" warning with 'dig +qr'.
 [RT #15780].

---
 CHANGES       | 3 +++
 bin/dig/dig.c | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index ef29e7d965..702615242b 100644
--- 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 4f1db0f3c5..1b42785afd 100644
--- 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");