Merge branch '992-fetchcount-increment-in-resume-qmin-v9_14' into 'v9_14'

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

See merge request isc-projects/bind9!1850
This commit is contained in:
Mark Andrews
2019-04-23 21:14:40 -04:00
2 changed files with 10 additions and 0 deletions

View File

@@ -2,6 +2,9 @@
5217. [bug] Restore key id calculation for RSAMD5. [GL #996]
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]

View File

@@ -4192,6 +4192,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);