From: Matthijs Mekking <matthijs@isc.org>
Date: Thu, 27 May 2021 13:54:13 +0000 (+0200)
Subject: Reset DNS_FETCHOPT_TRYSTALE_ONTIMEOUT on resume
X-Git-Tag: v9.17.14~16^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0dc5937c7000dd9b11da7623c89862cdbd325d8;p=thirdparty%2Fbind9.git

Reset DNS_FETCHOPT_TRYSTALE_ONTIMEOUT on resume

Once we resume a query, we should clear DNS_FETCHOPT_TRYSTALE_ONTIMEOUT
from the options to prevent triggering the stale-answer-client-timeout
on subsequent fetches.

If we don't this may cause a crash when for example when prefetch is
triggered after a query restart.
---

diff --git a/lib/ns/query.c b/lib/ns/query.c
index d3546f9d5cc..97c3be1dd04 100644
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -6118,6 +6118,7 @@ fetch_callback(isc_task_t *task, isc_event_t *event) {
 	if (client->view->cachedb != NULL && client->view->recursion) {
 		client->query.attributes |= NS_QUERYATTR_RECURSIONOK;
 	}
+	client->query.fetchoptions &= ~DNS_FETCHOPT_TRYSTALE_ONTIMEOUT;
 	client->query.dboptions &= ~DNS_DBFIND_STALETIMEOUT;
 	client->nodetach = false;