From: Witold Kręcicki <wpk@isc.org>
Date: Fri, 24 May 2019 12:03:16 +0000 (+0200)
Subject: Don't SERVFAIL on lame delegations when doing minimization in relaxed mode.
X-Git-Tag: v9.15.1~24^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2691e729f0a4ffee8eedd458b85d68967c252776;p=thirdparty%2Fbind9.git

Don't SERVFAIL on lame delegations when doing minimization in relaxed mode.

qname minimization in relaxed mode should fall back to regular
resolution in case of failure.
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index b2bc2516d6f..0c55f741f38 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4158,7 +4158,7 @@ resume_qmin(isc_task_t *task, isc_event_t *event) {
 	}
 
 	if (NXDOMAIN_RESULT(result) || result == DNS_R_FORMERR ||
-	    result == DNS_R_REMOTEFORMERR)
+	    result == DNS_R_REMOTEFORMERR || result == ISC_R_FAILURE)
 	{
 		if ((fctx->options & DNS_FETCHOPT_QMIN_STRICT) == 0) {
 			fctx->qmin_labels = DNS_MAX_LABELS + 1;