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)

diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 5f2eb9542c41a814c9fb9bf3bb269371a70fc8da..712fc0755aa6400fce8be46745091e9af26fb69e 100644 (file)
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -1060,8 +1060,8 @@ create_fetch(dns_validator_t *val, dns_name_t *name, dns_rdatatype_t type,
        validator_logcreate(val, name, type, caller, "fetch");
        return dns_resolver_createfetch(
                val->view->resolver, name, type, NULL, NULL, NULL, NULL, 0,
-               fopts, 0, NULL, NULL, val->event->ev_sender, callback, val,
-               &val->frdataset, &val->fsigrdataset, &val->fetch);
+               fopts, 0, val->qc, val->gqc, val->event->ev_sender, callback,
+               val, &val->frdataset, &val->fsigrdataset, &val->fetch);
 }
 
 /*%