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 92ab963ffeb55e872e686fa30a525749e7c326c2..b1e06f2c5d0fa1b6cfcf9bcbbf787da966b37149 100644 (file)
--- 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);
        }