Fix rndc dnstap -roll N

The `rndc` argument was always overridden by the static configuration,
because the logic for handling the number of dnstap files to retain
was both backwards and a bit redundant.

(cherry picked from commit 7c07129a51)
This commit is contained in:
Tony Finch 2020-06-21 21:17:51 +01:00 committed by Mark Andrews
parent 7579386567
commit b7f7b8128e

View file

@ -337,7 +337,7 @@ dns_dt_reopen(dns_dtenv_t *env, int roll) {
fstrm_iothr_destroy(&env->iothr);
}
if (roll != 0) {
if (roll == 0) {
roll = env->rolls;
}
@ -349,7 +349,7 @@ dns_dt_reopen(dns_dtenv_t *env, int roll) {
char *filename = isc_mem_strdup(env->mctx, env->path);
file.name = filename;
file.stream = NULL;
file.versions = roll != 0 ? roll : env->rolls;
file.versions = roll;
file.maximum_size = 0;
file.maximum_reached = false;
file.suffix = env->suffix;