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.

diff --git a/lib/dns/dnstap.c b/lib/dns/dnstap.c
index 42de18f9e41f8656441ca78b43cd104b148cd81c..f6073db991534fa560c972dbe990b8e5b06c4634 100644 (file)
--- a/lib/dns/dnstap.c
+++ b/lib/dns/dnstap.c
@@ -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;