From: Mark Andrews <marka@isc.org>
Date: Tue, 23 May 2006 04:40:42 +0000 (+0000)
Subject: 2029.   [bug]           host printed out the server multiple times when
X-Git-Tag: v9.4.0a6~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c7ca945e9943e55590dc70cb566efa256cc7bf1;p=thirdparty%2Fbind9.git

2029.   [bug]           host printed out the server multiple times when
                        specified on the command line. [RT #15992]
---

diff --git a/CHANGES b/CHANGES
index 70bf7f4f279..6183c38d9f9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2029.	[bug]		host printed out the server multiple times when
+			specified on the command line. [RT #15992]
+
 2028.	[port]		linux: socket.c compatability for old systems.
 			[RT #16015]
 
diff --git a/bin/dig/host.c b/bin/dig/host.c
index 13c0200c771..f73145c3343 100644
--- a/bin/dig/host.c
+++ b/bin/dig/host.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: host.c,v 1.94.18.13 2006/03/02 23:48:49 marka Exp $ */
+/* $Id: host.c,v 1.94.18.14 2006/05/23 04:40:42 marka Exp $ */
 
 /*! \file */
 
@@ -48,6 +48,7 @@ static isc_boolean_t default_lookups = ISC_TRUE;
 static int seen_error = -1;
 static isc_boolean_t list_addresses = ISC_TRUE;
 static dns_rdatatype_t list_type = dns_rdatatype_a;
+static isc_boolean_t printed_server = ISC_FALSE;
 
 static const char *opcodetext[] = {
 	"QUERY",
@@ -398,7 +399,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 	 */
 	force_error = (seen_error == 1) ? 1 : 0;
 	seen_error = 1;
-	if (listed_server) {
+	if (listed_server && !printed_server) {
 		char sockstr[ISC_SOCKADDR_FORMATSIZE];
 
 		printf("Using domain server:\n");
@@ -407,6 +408,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, isc_boolean_t headers) {
 				    sizeof(sockstr));
 		printf("Address: %s\n", sockstr);
 		printf("Aliases: \n\n");
+		printed_server = ISC_TRUE;
 	}
 
 	if (msg->rcode != 0) {