From e96d6ee85fe8979169675ad70a1f5966a2652bb9 Mon Sep 17 00:00:00 2001 From: Matthijs Mekking Date: Fri, 6 Dec 2024 16:41:15 +0100 Subject: [PATCH] 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. (cherry picked from commit 5b1ae4a9485af1f7a247fd0c23d16a0ce51456ab) --- lib/dns/validator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/dns/validator.c b/lib/dns/validator.c index ab13bf6095..7a4789229a 100644 --- a/lib/dns/validator.c +++ b/lib/dns/validator.c @@ -938,8 +938,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); }