diff --git a/CHANGES b/CHANGES index 995e418736..a60bba3421 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +4925. [func] Several configuration options that define intervals + can now take TTL value suffixes (for example, 2h or 1d) + in addition to integer parameters. These include + max-cache-ttl, max-ncache-ttl, max-policy-ttl, + fstrm-set-reopen-interval, interface-interval, and + min-update-interval. [GL #203] + 4924. [cleanup] Clean up the isc_string_* namespace and leave only strlcpy and strlcat. [GL #178] @@ -5,7 +12,7 @@ enum types. [GL !135] 4922. [bug] dnstap: Log the destination address of client - packets rather than the interface address. + packets rather than the interface address. [GL #197] 4921. [cleanup] Add dns_fixedname_initname() and refactor the caller diff --git a/bin/delv/delv.c b/bin/delv/delv.c index 1bcc9e7e3b..2e338e3b45 100644 --- a/bin/delv/delv.c +++ b/bin/delv/delv.c @@ -969,7 +969,7 @@ plus_option(char *option) { if (cmd == NULL) { printf(";; Invalid option %s\n", option); return; - } + } if (strncasecmp(cmd, "no", 2)==0) { cmd += 2; state = ISC_FALSE; diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 215faa155f..5c41a8e114 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -1049,7 +1049,7 @@ plus_option(char *option, isc_boolean_t is_batchfile, FULLCHECK("idnin"); #ifndef WITH_IDN_SUPPORT fprintf(stderr, ";; IDN input support" - " not enabled\n"); + " not enabled\n"); #else lookup->idnin = state; #endif @@ -1058,7 +1058,7 @@ plus_option(char *option, isc_boolean_t is_batchfile, FULLCHECK("idnout"); #ifndef WITH_IDN_OUT_SUPPORT fprintf(stderr, ";; IDN output support" - " not enabled\n"); + " not enabled\n"); #else lookup->idnout = state; #endif diff --git a/bin/dig/dig.docbook b/bin/dig/dig.docbook index 80318bb32f..453f4221b3 100644 --- a/bin/dig/dig.docbook +++ b/bin/dig/dig.docbook @@ -1299,7 +1299,7 @@ dig +qr www.isc.org any -x 127.0.0.1 isc.org ns +noqr dig appropriately converts character encoding of domain name before sending a request to DNS server or displaying a reply from the server. - If you'd like to turn off the IDN support for some reason, use + If you'd like to turn off the IDN support for some reason, use parameters +noidnin and +noidnout. diff --git a/bin/tests/system/checkconf/bad-interface-interval.conf b/bin/tests/system/checkconf/bad-interface-interval.conf new file mode 100644 index 0000000000..f39a7c0e29 --- /dev/null +++ b/bin/tests/system/checkconf/bad-interface-interval.conf @@ -0,0 +1,14 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +options { + interface-interval 1x; +}; diff --git a/bin/tests/system/checkconf/bad-maxcachettl.conf b/bin/tests/system/checkconf/bad-maxcachettl.conf new file mode 100644 index 0000000000..ab5c2c2c25 --- /dev/null +++ b/bin/tests/system/checkconf/bad-maxcachettl.conf @@ -0,0 +1,14 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +view one { + max-cache-ttl 1x; +}; diff --git a/bin/tests/system/checkconf/bad-maxncachettl.conf b/bin/tests/system/checkconf/bad-maxncachettl.conf new file mode 100644 index 0000000000..7e92adf7ea --- /dev/null +++ b/bin/tests/system/checkconf/bad-maxncachettl.conf @@ -0,0 +1,14 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +view one { + max-ncache-ttl 1x; +}; diff --git a/bin/tests/system/checkconf/bad-rpz-ttl.conf b/bin/tests/system/checkconf/bad-rpz-ttl.conf new file mode 100644 index 0000000000..af35952982 --- /dev/null +++ b/bin/tests/system/checkconf/bad-rpz-ttl.conf @@ -0,0 +1,22 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +zone "example.com." { + type master; + file "example.com.zone"; +}; + +options { + response-policy { + zone "example.com." policy given; + } + max-policy-ttl 1x; +}; diff --git a/bin/tests/system/checkconf/bad-rpz-update.conf b/bin/tests/system/checkconf/bad-rpz-update.conf new file mode 100644 index 0000000000..1c06bfd508 --- /dev/null +++ b/bin/tests/system/checkconf/bad-rpz-update.conf @@ -0,0 +1,23 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +zone "example.com." { + type master; + file "example.com.zone"; +}; + +options { + response-policy { + zone "example.com." + policy given + min-update-interval 5x; + }; +}; diff --git a/bin/tests/system/checkconf/good-interface-interval.conf b/bin/tests/system/checkconf/good-interface-interval.conf new file mode 100644 index 0000000000..16aee1d69f --- /dev/null +++ b/bin/tests/system/checkconf/good-interface-interval.conf @@ -0,0 +1,14 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +options { + interface-interval 1h; +}; diff --git a/bin/tests/system/checkconf/good-maxcachettl.conf b/bin/tests/system/checkconf/good-maxcachettl.conf new file mode 100644 index 0000000000..2ebef0afd3 --- /dev/null +++ b/bin/tests/system/checkconf/good-maxcachettl.conf @@ -0,0 +1,32 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +view one { + max-cache-ttl 0; +}; +view two { + max-cache-ttl 86400; +}; +view three { + max-cache-ttl 4000000000; +}; +view four { + max-cache-ttl 3600s; +}; +view five { + max-cache-ttl 1h; +}; +view six { + max-cache-ttl 1d; +}; +view seven { + max-cache-ttl 1w; +}; diff --git a/bin/tests/system/checkconf/good-maxncachettl.conf b/bin/tests/system/checkconf/good-maxncachettl.conf new file mode 100644 index 0000000000..227da86c34 --- /dev/null +++ b/bin/tests/system/checkconf/good-maxncachettl.conf @@ -0,0 +1,32 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +view one { + max-ncache-ttl 0; +}; +view two { + max-ncache-ttl 86400; +}; +view three { + max-ncache-ttl 4000000000; +}; +view four { + max-ncache-ttl 3600s; +}; +view five { + max-ncache-ttl 1h; +}; +view six { + max-ncache-ttl 1d; +}; +view seven { + max-ncache-ttl 1w; +}; diff --git a/bin/tests/system/checkconf/good-rpz-ttl.conf b/bin/tests/system/checkconf/good-rpz-ttl.conf new file mode 100644 index 0000000000..96d09a9b85 --- /dev/null +++ b/bin/tests/system/checkconf/good-rpz-ttl.conf @@ -0,0 +1,22 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +zone "example.com." { + type master; + file "example.com.zone"; +}; + +options { + response-policy { + zone "example.com." policy given; + } + max-policy-ttl 1h; +}; diff --git a/bin/tests/system/checkconf/good-rpz-update.conf b/bin/tests/system/checkconf/good-rpz-update.conf new file mode 100644 index 0000000000..188b559f48 --- /dev/null +++ b/bin/tests/system/checkconf/good-rpz-update.conf @@ -0,0 +1,23 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +zone "example.com." { + type master; + file "example.com.zone"; +}; + +options { + response-policy { + zone "example.com." + policy given + min-update-interval 5m; + }; +}; diff --git a/bin/tests/system/dnstap/bad-fstrm-reopen-interval.conf b/bin/tests/system/dnstap/bad-fstrm-reopen-interval.conf new file mode 100644 index 0000000000..dafa894852 --- /dev/null +++ b/bin/tests/system/dnstap/bad-fstrm-reopen-interval.conf @@ -0,0 +1,14 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +options { + fstrm-set-reopen-interval 1x; +}; diff --git a/bin/tests/system/dnstap/good-fstrm-reopen-interval.conf b/bin/tests/system/dnstap/good-fstrm-reopen-interval.conf new file mode 100644 index 0000000000..5e63a59606 --- /dev/null +++ b/bin/tests/system/dnstap/good-fstrm-reopen-interval.conf @@ -0,0 +1,14 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +options { + fstrm-set-reopen-interval 5m; +}; diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml index 9b9622676d..d57aa019bc 100644 --- a/doc/arm/Bv9ARM-book.xml +++ b/doc/arm/Bv9ARM-book.xml @@ -4454,6 +4454,8 @@ badresp:1,adberr:0,findfail:0,valfail:0] reopen a closed output stream. The minimum is 1 second, the maximum is 600 seconds (10 minutes), and the default is 5 seconds. + For convenience, TTL-style time unit suffixes may be + used to specify the value. @@ -8560,8 +8562,9 @@ avoid-v6-udp-ports { 40000; range 50000 60000; }; begin listening for queries on any newly discovered interfaces (provided they are allowed by the listen-on configuration), and - will - stop listening on interfaces that have gone away. + will stop listening on interfaces that have gone away. + For convenience, TTL-style time unit suffixes may be + used to specify the value. @@ -8871,8 +8874,9 @@ avoid-v6-udp-ports { 40000; range 50000 60000; }; To reduce network traffic and increase performance, the server stores negative answers. max-ncache-ttl is used to set a maximum retention time for these answers in - the server - in seconds. The default + the server in seconds. + For convenience, TTL-style time unit suffixes may be + used to specify the value. The default max-ncache-ttl is 10800 seconds (3 hours). max-ncache-ttl cannot exceed 7 days and will @@ -8887,6 +8891,8 @@ avoid-v6-udp-ports { 40000; range 50000 60000; }; Sets the maximum time for which the server will cache ordinary (positive) answers in seconds. + For convenience, TTL-style time unit suffixes may be + used to specify the value. The default is 604800 (one week). A value of zero may cause all queries to return SERVFAIL, because of lost caches of intermediate @@ -10164,6 +10170,8 @@ deny-answer-aliases { "example.net"; }; to a maximum value. The max-policy-ttl clause changes the maximum seconds from its default of 5. + For convenience, TTL-style time unit suffixes may be + used to specify the value. @@ -10250,6 +10258,8 @@ example.com CNAME rpz-tcp-only. than seconds after the most recent update, then the changes will not be carried out until this interval has elapsed. The default is 5 seconds. + For convenience, TTL-style time unit suffixes may be + used to specify the value. diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml index c15b2ac4a0..49c6acbd4e 100644 --- a/doc/arm/notes.xml +++ b/doc/arm/notes.xml @@ -140,6 +140,21 @@ supported by default; previously the limit was 32. [GL #123] + + + Several configuration options for time periods can now use + TTL value suffixes (for example, 2h or + 1d) in addition to an integer number of + seconds. These include: + fstrm-set-reopen-interval; + interface-interval; + max-cache-ttl; + max-ncache-ttl; + max-policy-ttl; + min-update-interval. + [GL #203] + + diff --git a/lib/dns/rdata/generic/soa_6.c b/lib/dns/rdata/generic/soa_6.c index 3ab5f5ec04..8101ef59c7 100644 --- a/lib/dns/rdata/generic/soa_6.c +++ b/lib/dns/rdata/generic/soa_6.c @@ -139,7 +139,7 @@ totext_soa(ARGS_TOTEXT) { if (i >= 1) { RETERR(str_totext(" (", target)); RETERR(dns_ttl_totext(num, ISC_TRUE, - ISC_TRUE, target)); + ISC_TRUE, target)); RETERR(str_totext(")", target)); } RETERR(str_totext(tctx->linebreak, target)); diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 7bd6fce625..710dd12a05 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -1065,7 +1065,7 @@ options_clauses[] = { { "fstrm-set-output-notify-threshold", &cfg_type_uint32, 0 }, { "fstrm-set-output-queue-model", &cfg_type_fstrm_model, 0 }, { "fstrm-set-output-queue-size", &cfg_type_uint32, 0 }, - { "fstrm-set-reopen-interval", &cfg_type_uint32, 0 }, + { "fstrm-set-reopen-interval", &cfg_type_ttlval, 0 }, #else { "fstrm-set-buffer-hint", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTCONFIGURED }, @@ -1079,7 +1079,7 @@ options_clauses[] = { CFG_CLAUSEFLAG_NOTCONFIGURED }, { "fstrm-set-output-queue-size", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTCONFIGURED }, - { "fstrm-set-reopen-interval", &cfg_type_uint32, + { "fstrm-set-reopen-interval", &cfg_type_ttlval, CFG_CLAUSEFLAG_NOTCONFIGURED }, #endif /* HAVE_DNSTAP */ #ifdef HAVE_GEOIP @@ -1095,7 +1095,7 @@ options_clauses[] = { { "host-statistics", &cfg_type_boolean, CFG_CLAUSEFLAG_NOTIMP }, { "host-statistics-max", &cfg_type_uint32, CFG_CLAUSEFLAG_NOTIMP }, { "hostname", &cfg_type_qstringornone, 0 }, - { "interface-interval", &cfg_type_uint32, 0 }, + { "interface-interval", &cfg_type_ttlval, 0 }, { "keep-response-order", &cfg_type_bracketed_aml, 0 }, { "listen-on", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI }, { "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI }, @@ -1621,8 +1621,8 @@ static cfg_type_t cfg_type_rpz_policy = { static cfg_tuplefielddef_t rpz_zone_fields[] = { { "zone name", &cfg_type_rpz_zone, 0 }, { "log", &cfg_type_boolean, 0 }, - { "max-policy-ttl", &cfg_type_uint32, 0 }, - { "min-update-interval", &cfg_type_uint32, 0 }, + { "max-policy-ttl", &cfg_type_ttlval, 0 }, + { "min-update-interval", &cfg_type_ttlval, 0 }, { "policy", &cfg_type_rpz_policy, 0 }, { "recursive-only", &cfg_type_boolean, 0 }, { "nsip-enable", &cfg_type_boolean, 0 }, @@ -1642,8 +1642,8 @@ static cfg_type_t cfg_type_rpz_list = { static cfg_tuplefielddef_t rpz_fields[] = { { "zone list", &cfg_type_rpz_list, 0 }, { "break-dnssec", &cfg_type_boolean, 0 }, - { "max-policy-ttl", &cfg_type_uint32, 0 }, - { "min-update-interval", &cfg_type_uint32, 0 }, + { "max-policy-ttl", &cfg_type_ttlval, 0 }, + { "min-update-interval", &cfg_type_ttlval, 0 }, { "min-ns-dots", &cfg_type_uint32, 0 }, { "nsip-wait-recurse", &cfg_type_boolean, 0 }, { "qname-wait-recurse", &cfg_type_boolean, 0 }, @@ -1680,7 +1680,7 @@ static cfg_tuplefielddef_t catz_zone_fields[] = { { "default-masters", &cfg_type_namesockaddrkeylist, 0 }, { "zone-directory", &cfg_type_qstring, 0 }, { "in-memory", &cfg_type_boolean, 0 }, - { "min-update-interval", &cfg_type_uint32, 0 }, + { "min-update-interval", &cfg_type_ttlval, 0 }, { NULL, NULL, 0 } }; static cfg_type_t cfg_type_catz_tuple = { @@ -1916,9 +1916,9 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, - { "max-cache-ttl", &cfg_type_uint32, 0 }, + { "max-cache-ttl", &cfg_type_ttlval, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, - { "max-ncache-ttl", &cfg_type_uint32, 0 }, + { "max-ncache-ttl", &cfg_type_ttlval, 0 }, { "max-recursion-depth", &cfg_type_uint32, 0 }, { "max-recursion-queries", &cfg_type_uint32, 0 }, { "max-stale-ttl", &cfg_type_ttlval, 0 }, diff --git a/lib/samples/nsprobe.c b/lib/samples/nsprobe.c index 46088cd8dc..a6c59880e5 100644 --- a/lib/samples/nsprobe.c +++ b/lib/samples/nsprobe.c @@ -478,7 +478,7 @@ set_nextqname(struct probe_trans *trans) { if ((domainlen = strlcat(buf, trans->domain, sizeof(buf))) >= sizeof(buf)) { return ISC_R_NOSPACE; } - + isc_buffer_init(&b, buf, domainlen); isc_buffer_add(&b, domainlen); trans->qname = dns_fixedname_initname(&trans->fixedname); diff --git a/util/copyrights b/util/copyrights index 12624339a3..3793322183 100644 --- a/util/copyrights +++ b/util/copyrights @@ -637,6 +637,7 @@ ./bin/tests/system/checkconf/bad-hint.conf CONF-C 2014,2016,2018 ./bin/tests/system/checkconf/bad-in-view-dup.conf CONF-C 2018 ./bin/tests/system/checkconf/bad-inline-slave.conf CONF-C 2013,2016,2018 +./bin/tests/system/checkconf/bad-interface-interval.conf CONF-C 2018 ./bin/tests/system/checkconf/bad-keep-response-order.conf CONF-C 2015,2016,2018 ./bin/tests/system/checkconf/bad-lifetime.conf CONF-C 2014,2016,2018 ./bin/tests/system/checkconf/bad-lmdb-mapsize-bogus.conf CONF-C 2017,2018 @@ -645,6 +646,8 @@ ./bin/tests/system/checkconf/bad-lmdb-mapsize-unlimited.conf CONF-C 2017,2018 ./bin/tests/system/checkconf/bad-many.conf CONF-C 2005,2012,2015,2016,2018 ./bin/tests/system/checkconf/bad-master-request-ixfr.conf CONF-C 2014,2016,2018 +./bin/tests/system/checkconf/bad-maxcachettl.conf CONF-C 2018 +./bin/tests/system/checkconf/bad-maxncachettl.conf CONF-C 2018 ./bin/tests/system/checkconf/bad-maxttlmap.conf CONF-C 2014,2016,2018 ./bin/tests/system/checkconf/bad-noddns.conf CONF-C 2014,2016,2018 ./bin/tests/system/checkconf/bad-options-also-notify.conf CONF-C 2016,2018 @@ -663,6 +666,8 @@ ./bin/tests/system/checkconf/bad-rate-limit-slip.conf CONF-C 2016,2018 ./bin/tests/system/checkconf/bad-rate-limit-window.conf CONF-C 2016,2018 ./bin/tests/system/checkconf/bad-rpz-too-many-zones.conf CONF-C 2018 +./bin/tests/system/checkconf/bad-rpz-ttl.conf CONF-C 2018 +./bin/tests/system/checkconf/bad-rpz-update.conf CONF-C 2018 ./bin/tests/system/checkconf/bad-rpz-zone.conf CONF-C 2016,2018 ./bin/tests/system/checkconf/bad-sharedwritable1.conf CONF-C 2014,2016,2018 ./bin/tests/system/checkconf/bad-sharedwritable2.conf CONF-C 2014,2016,2018 @@ -702,12 +707,17 @@ ./bin/tests/system/checkconf/good-class.conf CONF-C 2015,2016,2018 ./bin/tests/system/checkconf/good-dlv-dlv.example.com.conf CONF-C 2017,2018 ./bin/tests/system/checkconf/good-glue-cache.conf CONF-C 2017,2018 +./bin/tests/system/checkconf/good-interface-interval.conf CONF-C 2018 ./bin/tests/system/checkconf/good-lmdb-mapsize-largest.conf CONF-C 2017,2018 ./bin/tests/system/checkconf/good-lmdb-mapsize-smallest.conf CONF-C 2017,2018 +./bin/tests/system/checkconf/good-maxcachettl.conf CONF-C 2018 +./bin/tests/system/checkconf/good-maxncachettl.conf CONF-C 2018 ./bin/tests/system/checkconf/good-nested.conf CONF-C 2015,2016,2018 ./bin/tests/system/checkconf/good-options-also-notify.conf CONF-C 2016,2018 ./bin/tests/system/checkconf/good-printtime.conf CONF-C 2016,2018 ./bin/tests/system/checkconf/good-response-dot.conf CONF-C 2017,2018 +./bin/tests/system/checkconf/good-rpz-ttl.conf CONF-C 2018 +./bin/tests/system/checkconf/good-rpz-update.conf CONF-C 2018 ./bin/tests/system/checkconf/good-update-policy1.conf CONF-C 2018 ./bin/tests/system/checkconf/good-update-policy10.conf CONF-C 2018 ./bin/tests/system/checkconf/good-update-policy11.conf CONF-C 2018 @@ -1102,6 +1112,7 @@ ./bin/tests/system/dnssec/signer/remove.db.in ZONE 2016,2018 ./bin/tests/system/dnssec/signer/remove2.db.in ZONE 2016,2018 ./bin/tests/system/dnssec/tests.sh SH 2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 +./bin/tests/system/dnstap/bad-fstrm-reopen-interval.conf CONF-C 2018 ./bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-max.conf CONF-C 2016,2018 ./bin/tests/system/dnstap/bad-fstrm-set-buffer-hint-min.conf CONF-C 2016,2018 ./bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-max.conf CONF-C 2016,2018 @@ -1116,6 +1127,7 @@ ./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-min.conf CONF-C 2016,2018 ./bin/tests/system/dnstap/bad-size-version.conf CONF-C 2017,2018 ./bin/tests/system/dnstap/clean.sh SH 2015,2016,2017,2018 +./bin/tests/system/dnstap/good-fstrm-reopen-interval.conf CONF-C 2018 ./bin/tests/system/dnstap/good-fstrm-set-buffer-hint.conf CONF-C 2016,2018 ./bin/tests/system/dnstap/good-fstrm-set-flush-timeout.conf CONF-C 2016,2018 ./bin/tests/system/dnstap/good-fstrm-set-input-queue-size.conf CONF-C 2016,2018 @@ -1377,10 +1389,8 @@ ./bin/tests/system/gost/setup.sh SH 2010,2012,2014,2016,2017,2018 ./bin/tests/system/gost/tests.sh SH 2010,2012,2013,2016,2018 ./bin/tests/system/idna/clean.sh SH 2018 -./bin/tests/system/idna/ns1/named.conf CONF-C 2018 ./bin/tests/system/idna/ns1/named.conf.in CONF-C 2018 ./bin/tests/system/idna/ns1/root.db ZONE 2018 -./bin/tests/system/idna/prereq.sh SH 2018 ./bin/tests/system/idna/setup.sh SH 2018 ./bin/tests/system/idna/tests.sh SH 2018 ./bin/tests/system/ifconfig.bat BAT 2016,2018