When resuming from qname-minimization increase fetches-per-zone counters for the...

diff --git a/CHANGES b/CHANGES
index 07d5915571f910edbb05e6f851cba69ef5c84848..16e8fc6f0f25d2ad2055d5efcecd993a91877238 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5216.  [bug]           Fetches-per-zone counter wasn't updated correctly
+                       when doing qname minimization. [GL #992]
+
 5215.  [bug]           Change #5124 was incomplete; named could still
                        return FORMERR instead of SERVFAIL in some cases.
                        [GL #990]

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index e4294ec4e620f388f1028bffeb618abd572065ee..6681196da13982afac5e88ca9a35db0f548adbae 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4190,6 +4190,13 @@ resume_qmin(isc_task_t *task, isc_event_t *event) {
                fctx_done(fctx, result, __LINE__);
                goto cleanup;
        }
+
+       result = fcount_incr(fctx, false);
+       if (result != ISC_R_SUCCESS) {
+               fctx_done(fctx, result, __LINE__);
+               goto cleanup;
+       }
+
        dns_name_free(&fctx->qmindcname, fctx->mctx);
        dns_name_init(&fctx->qmindcname, NULL);
        result = dns_name_dup(dcname, fctx->mctx, &fctx->qmindcname);