From: Mark Andrews <marka@isc.org>
Date: Thu, 15 Aug 2024 13:34:59 +0000 (+1000)
Subject: Fix handling of ISC_R_TIMEOUT in resume_qmin()
X-Git-Tag: v9.21.7~56^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=496f7963cdb1d15ff9fb1dece795534b25f33530;p=thirdparty%2Fbind9.git

Fix handling of ISC_R_TIMEOUT in resume_qmin()

If a timeout occurs when sending a QMIN query, QNAME
minimization should be disabled. This now causes a hard
failure in strict mode, or a fallback to non-minimized queries
in relaxed mode.
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index caf670b3ba2..c1f9579cace 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4241,6 +4241,7 @@ resume_qmin(void *arg) {
 	case DNS_R_FORMERR:
 	case DNS_R_REMOTEFORMERR:
 	case ISC_R_FAILURE:
+	case ISC_R_TIMEDOUT:
 		if ((fctx->options & DNS_FETCHOPT_QMIN_STRICT) != 0) {
 			/* These results cause a hard fail in strict mode */
 			goto cleanup;