From: Matthijs Mekking <matthijs@isc.org>
Date: Fri, 6 Dec 2024 15:41:15 +0000 (+0100)
Subject: Use query counters in validator code
X-Git-Tag: v9.21.4~45^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b1ae4a9485af1f7a247fd0c23d16a0ce51456ab;p=thirdparty%2Fbind9.git

Use query counters in validator code

Commit af7db8951364a89c468eda1535efb3f53adc2c1f as part of #4141 was
supposed to apply the 'max-recursion-queries' quota to validator
queries, but the counter was never actually passed on to
dns_resolver_createfetch(). This has been fixed, and the global query
counter ('max-query-count', per client request) is now also added.
---

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 92ab963ffeb..b1e06f2c5d0 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -939,8 +939,8 @@ create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
 	dns_validator_ref(val);
 	result = dns_resolver_createfetch(
 		val->view->resolver, name, type, NULL, NULL, NULL, NULL, 0,
-		fopts, 0, NULL, NULL, val->loop, callback, val, &val->frdataset,
-		&val->fsigrdataset, &val->fetch);
+		fopts, 0, val->qc, val->gqc, val->loop, callback, val,
+		&val->frdataset, &val->fsigrdataset, &val->fetch);
 	if (result != ISC_R_SUCCESS) {
 		dns_validator_detach(&val);
 	}