From b4cf962eeff835f2764164e0e8ff300173863a65 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Mon, 4 Jan 2016 16:01:38 -0800
Subject: [PATCH] [v9_10] fixed bogus server regression

4288.	[bug]		Fixed a regression in resolver.c:possibly_mark()
			which caused known-bogus servers to be queried
			anyway. [RT #41321]
---
 CHANGES            |  4 ++++
 doc/arm/notes.xml  | 11 +++++++++--
 lib/dns/resolver.c | 11 +++++------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/CHANGES b/CHANGES
index b8c83c26ff..9af63bdfe4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4288.	[bug]		Fixed a regression in resolver.c:possibly_mark()
+			which caused known-bogus servers to be queried
+			anyway. [RT #41321]
+
 4287.	[bug]		Silence an overly noisy log message when message
 			parsing fails. [RT #41374]
 
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index f0cd222390..3146d1ad27 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -117,8 +117,15 @@
   <section xml:id="relnotes_bugs"><info><title>Bug Fixes</title></info>
 
     <itemizedlist>
-       <listitem>
- 	<para>
+      <listitem>
+	<para>
+	  Authoritative servers that were marked as bogus (e.g. blackholed
+	  in configuration or with invalid addresses) were being queried
+	  anyway. [RT #41321]
+	</para>
+      </listitem>
+      <listitem>
+	<para>
 	  Some of the options for GeoIP ACLs, including "areacode",
 	  "metrocode", and "timezone", were incorrectly documented
 	  as "area", "metro" and "tz".  Both the long and abbreviated
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index aa6a9bb51f..25ce7fd144 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -3418,9 +3418,6 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) {
 	    bogus)
 		aborted = ISC_TRUE;
 
-	if (!isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3)))
-		return;
-
 	if (aborted) {
 		addr->flags |= FCTX_ADDRINFO_MARK;
 		msg = "ignoring blackholed / bogus server: ";
@@ -3444,9 +3441,11 @@ possibly_mark(fetchctx_t *fctx, dns_adbaddrinfo_t *addr) {
 	} else
 		return;
 
-	isc_netaddr_fromsockaddr(&na, sa);
-	isc_netaddr_format(&na, buf, sizeof(buf));
-	FCTXTRACE2(msg, buf);
+	if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) {
+		isc_netaddr_fromsockaddr(&na, sa);
+		isc_netaddr_format(&na, buf, sizeof(buf));
+		FCTXTRACE2(msg, buf);
+	}
 }
 
 static inline dns_adbaddrinfo_t *