From: Mark Andrews <marka@isc.org>
Date: Thu, 14 Nov 2013 11:38:29 +0000 (+1100)
Subject: adjust EDNS query returned status warning message
X-Git-Tag: v9.6-ESV-R11b1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39ce3f5e5c5ae57615c9f9fca4931076dbdeb9b9;p=thirdparty%2Fbind9.git

adjust EDNS query returned status warning message

(cherry picked from commit 0b565f60605c2500141639f404b010150b054612)
---

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index c12fc3917e3..bc4f20621d8 100644
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -530,8 +530,9 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 		    (msg->rcode == dns_rcode_formerr ||
 		     msg->rcode == dns_rcode_notimp))
 			printf("\n;; WARNING: EDNS query returned status "
-			       "%s - retry with '+noedns'\n",
-			       rcode_totext(msg->rcode));
+			       "%s - retry with '%s+noedns'\n",
+			       rcode_totext(msg->rcode),
+			       query->lookup->dnssec ? "+nodnssec ": "");
 		if (msg != query->lookup->sendmsg && extrabytes != 0U)
 			printf(";; WARNING: Message has %u extra byte%s at "
 			       "end\n", extrabytes, extrabytes != 0 ? "s" : "");