From: Andoni Duarte Pintado <andoni@isc.org>
Date: Wed, 16 Jul 2025 15:16:27 +0000 (+0200)
Subject: Merge tag 'v9.21.10'
X-Git-Tag: v9.21.11~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffee986ae0b2834f7f40dc3c92f50e6af2ae3d72;p=thirdparty%2Fbind9.git

Merge tag 'v9.21.10'
---

ffee986ae0b2834f7f40dc3c92f50e6af2ae3d72
diff --cc lib/ns/query.c
index 677c388bd89,4ea0859c824..fc58f305d4c
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@@ -5939,10 -5935,8 +5939,8 @@@ query_lookup(query_ctx_t *qctx) 
  			{
  				qctx_clean(qctx);
  				qctx_freedata(qctx);
 -				dns_db_attach(qctx->client->view->cachedb,
 +				dns_db_attach(qctx->client->inner.view->cachedb,
  					      &qctx->db);
- 				qctx->client->query.dboptions &=
- 					~DNS_DBFIND_STALETIMEOUT;
  				qctx->options.stalefirst = false;
  				if (FETCH_RECTYPE_NORMAL(qctx->client) != NULL)
  				{