From 05a91e4e4c301a11cfd4648389f0625249cde8a8 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Thu, 15 Feb 2018 16:11:52 -0800
Subject: [PATCH 1/2] list servers that time out in dig +nssearch

---
 bin/dig/dighost.c | 10 +++++++++-
 doc/arm/notes.xml |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index 96ba8e44ff..508c620e67 100644
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -2983,7 +2983,15 @@ connect_timeout(isc_task_t *task, isc_event_t *event) {
 			check_next_lookup(l);
 		}
 	} else {
-		if (!l->ns_search_only) {
+		if (l->ns_search_only) {
+			isc_netaddr_t netaddr;
+			char buf[ISC_NETADDR_FORMATSIZE];
+
+			isc_netaddr_fromsockaddr(&netaddr, &query->sockaddr);
+			isc_netaddr_format(&netaddr, buf, sizeof(buf));
+
+			printf(";; no response from %s\n", buf);
+		} else {
 			fputs(l->cmdline, stdout);
 			printf(";; connection timed out; no servers could be "
 			       "reached\n");
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index b8c58fed88..16cd062a38 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -108,6 +108,12 @@
 	  [RT #43670]
 	</para>
       </listitem>
+      <listitem>
+	<para>
+	  <command>dig +nssearch</command> will now list name servers
+	  that have timed out, in addition to those that respond. [GL #64]
+	</para>
+      </listitem>
     </itemizedlist>
   </section>
 

From 7d29f7e94bdd37f3102fe6b204a4ab5305809c9b Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Sat, 24 Feb 2018 11:02:03 -0800
Subject: [PATCH 2/2] CHANGES, doc

---
 CHANGES             | 4 ++++
 bin/dig/dig.docbook | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index f7b8e6fca5..365a838d81 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4901.	[func]		"dig +nssearch" now lists the name servers
+			for a domain that time out, as well as the servers
+			that respond. [GL #64]
+
 4900.	[cleanup]	Remove all uses of inet_aton(). [GL #13]
 
 4899.	[test]		Convert most of the remaining system tests to be able
diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook
index 742d3cc7e1..219cfd5dee 100644
--- a/bin/dig/dig.docbook
+++ b/bin/dig/dig.docbook
@@ -877,7 +877,8 @@
 	      attempts to find the authoritative name servers for
 	      the zone containing the name being looked up and
 	      display the SOA record that each name server has for
-	      the zone.
+	      the zone. Addresses of servers that that did not
+	      respond are also printed.
 	    </para>
 	  </listitem>
 	</varlistentry>