]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Exclude configuration files from the copyright mumbo-jumbo
authorOndřej Surý <ondrej@sury.org>
Mon, 12 Nov 2018 14:30:40 +0000 (15:30 +0100)
committerOndřej Surý <ondrej@sury.org>
Mon, 12 Nov 2018 15:01:37 +0000 (16:01 +0100)
util/copyrights
util/merge_copyrights
util/update_copyrights

index 75187982993362987a26bfefa22720f5d2a2d34b..e7f2c38d98feb4df50625158a2e5d27dfcb8b97e 100644 (file)
 ./bin/python/isc/rndc.py.in                    PYTHON  2016,2018
 ./bin/python/isc/tests/dnskey_test.py.in       PYTHON  2016,2018
 ./bin/python/isc/tests/policy_test.py.in       PYTHON  2016,2017,2018
-./bin/python/isc/tests/test-policies/01-keysize.pol    CONF-C  2016,2018
-./bin/python/isc/tests/test-policies/02-prepublish.pol CONF-C  2016,2018
-./bin/python/isc/tests/test-policies/03-postpublish.pol        CONF-C  2016,2018
-./bin/python/isc/tests/test-policies/04-combined-pre-post.pol  CONF-C  2016,2018
-./bin/python/isc/tests/test-policies/05-numeric-zone.pol       CONF-C  2017,2018
+./bin/python/isc/tests/test-policies/01-keysize.pol    X       2016,2018
+./bin/python/isc/tests/test-policies/02-prepublish.pol X       2016,2018
+./bin/python/isc/tests/test-policies/03-postpublish.pol        X       2016,2018
+./bin/python/isc/tests/test-policies/04-combined-pre-post.pol  X       2016,2018
+./bin/python/isc/tests/test-policies/05-numeric-zone.pol       X       2017,2018
 ./bin/python/isc/tests/testdata/Kexample.com.+007+35529.key    X       2016,2018
 ./bin/python/isc/tests/testdata/Kexample.com.+007+35529.private        X       2016,2018
 ./bin/python/isc/utils.py.in                   PYTHON  2016,2018
 ./bin/rndc/include/rndc/os.h                   C       2001,2004,2005,2007,2009,2016,2018
 ./bin/rndc/rndc.8                              MAN     DOCBOOK
 ./bin/rndc/rndc.c                              C       2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/rndc/rndc.conf                           CONF-C  2000,2001,2004,2007,2013,2014,2016,2018
 ./bin/rndc/rndc.conf.5                         MAN     DOCBOOK
 ./bin/rndc/rndc.conf.docbook                   SGML    2000,2001,2004,2005,2007,2013,2014,2015,2016,2018
 ./bin/rndc/rndc.conf.html                      HTML    DOCBOOK
 ./bin/tests/fromhex.pl                         PERL    2015,2016,2018
 ./bin/tests/headerdep_test.sh.in               SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/makejournal.c                      C       2013,2015,2016,2017,2018
-./bin/tests/named.conf                         CONF-C  1999,2000,2001,2004,2007,2011,2015,2016,2018
 ./bin/tests/optional/Kchild.example.+005+33180.key     X       2018
 ./bin/tests/optional/Kchild.example.+005+33180.private X       2018
 ./bin/tests/optional/adb_test.c                        C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2013,2015,2016,2018
 ./bin/tests/startperf/smallzone.db             ZONE    2011,2016,2018
 ./bin/tests/system/README                      TXT.BRIEF       2000,2001,2004,2010,2011,2013,2015,2016,2017,2018
 ./bin/tests/system/acl/clean.sh                        SH      2008,2012,2014,2015,2016,2017,2018
-./bin/tests/system/acl/ns2/named1.conf.in      CONF-C  2008,2016,2018
-./bin/tests/system/acl/ns2/named2.conf.in      CONF-C  2008,2016,2018
-./bin/tests/system/acl/ns2/named3.conf.in      CONF-C  2008,2016,2018
-./bin/tests/system/acl/ns2/named4.conf.in      CONF-C  2008,2016,2018
-./bin/tests/system/acl/ns2/named5.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/acl/ns3/example.db          ZONE    2017,2018
-./bin/tests/system/acl/ns3/named.conf.in       CONF-C  2017,2018
 ./bin/tests/system/acl/ns4/example.db          ZONE    2017,2018
 ./bin/tests/system/acl/ns4/existing.db         ZONE    2017,2018
-./bin/tests/system/acl/ns4/named.conf.in       CONF-C  2017,2018
 ./bin/tests/system/acl/setup.sh                        SH      2008,2012,2014,2016,2018
 ./bin/tests/system/acl/tests.sh                        SH      2008,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/additional/clean.sh         SH      2013,2014,2016,2017,2018
 ./bin/tests/system/additional/ns1/mx.db                ZONE    2016,2018
 ./bin/tests/system/additional/ns1/named.args   X       2013,2014,2018
-./bin/tests/system/additional/ns1/named1.conf.in       CONF-C  2013,2016,2017,2018
-./bin/tests/system/additional/ns1/named2.conf.in       CONF-C  2013,2016,2017,2018
-./bin/tests/system/additional/ns1/named3.conf.in       CONF-C  2016,2017,2018
-./bin/tests/system/additional/ns1/named4.conf.in       CONF-C  2016,2017,2018
 ./bin/tests/system/additional/ns1/naptr.db     ZONE    2013,2016,2018
 ./bin/tests/system/additional/ns1/naptr2.db    ZONE    2013,2016,2018
 ./bin/tests/system/additional/ns1/nid.db       ZONE    2013,2016,2018
 ./bin/tests/system/additional/ns1/rt.db                ZONE    2013,2016,2018
 ./bin/tests/system/additional/ns1/rt2.db       ZONE    2013,2016,2018
 ./bin/tests/system/additional/ns1/srv.db       ZONE    2016,2018
-./bin/tests/system/additional/ns2/named.conf.in        CONF-C  2018
 ./bin/tests/system/additional/ns2/root.db      ZONE    2018
-./bin/tests/system/additional/ns3/named.conf.in        CONF-C  2017,2018
 ./bin/tests/system/additional/ns3/root.hint    ZONE    2017,2018
 ./bin/tests/system/additional/setup.sh         SH      2013,2016,2018
 ./bin/tests/system/additional/tests.sh         SH      2013,2016,2017,2018
 ./bin/tests/system/addzone/clean.sh            SH      2010,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/addzone/ns1/inlineslave.db  ZONE    2013,2016,2018
-./bin/tests/system/addzone/ns1/named.conf.in   CONF-C  2013,2016,2017,2018
 ./bin/tests/system/addzone/ns1/redirect.db.1   ZONE    2017,2018
 ./bin/tests/system/addzone/ns1/redirect.db.2   ZONE    2017,2018
 ./bin/tests/system/addzone/ns2/added.db                ZONE    2010,2013,2016,2018
 ./bin/tests/system/addzone/ns2/default.nzf.in  X       2010,2018
 ./bin/tests/system/addzone/ns2/hints.db                ZONE    2016,2018
 ./bin/tests/system/addzone/ns2/inline.db       ZONE    2013,2016,2018
-./bin/tests/system/addzone/ns2/named1.conf.in  CONF-C  2010,2016,2018
-./bin/tests/system/addzone/ns2/named2.conf.in  CONF-C  2010,2011,2016,2018
-./bin/tests/system/addzone/ns2/named3.conf.in  CONF-C  2017,2018
 ./bin/tests/system/addzone/ns2/normal.db       ZONE    2010,2016,2018
 ./bin/tests/system/addzone/ns2/previous.db     ZONE    2010,2016,2018
 ./bin/tests/system/addzone/ns2/redirect.db.1   ZONE    2016,2017,2018
 ./bin/tests/system/addzone/ns2/redirect.db.2   ZONE    2016,2017,2018
 ./bin/tests/system/addzone/ns3/e.db            ZONE    2017,2018
-./bin/tests/system/addzone/ns3/named1.conf.in  CONF-C  2017,2018
-./bin/tests/system/addzone/ns3/named2.conf.in  CONF-C  2017,2018
 ./bin/tests/system/addzone/ns3/redirect.db.1   ZONE    2017,2018
 ./bin/tests/system/addzone/ns3/redirect.db.2   ZONE    2017,2018
 ./bin/tests/system/addzone/setup.sh            SH      2010,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/addzone/tests.sh            SH      2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/allow-query/clean.sh                SH      2010,2012,2014,2015,2016,2018
-./bin/tests/system/allow-query/ns1/named.conf.in       CONF-C  2018
 ./bin/tests/system/allow-query/ns1/root.db     ZONE    2018
 ./bin/tests/system/allow-query/ns2/generic.db  ZONE    2018
-./bin/tests/system/allow-query/ns2/named01.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named02.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named03.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named04.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named05.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named06.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named07.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named08.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named09.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named10.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named11.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named12.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named21.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named22.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named23.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named24.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named25.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named26.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named27.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named28.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named29.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named30.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named31.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named32.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named33.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named34.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named40.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named53.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named54.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named55.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named56.conf.in     CONF-C  2010,2016,2018
-./bin/tests/system/allow-query/ns2/named57.conf.in     CONF-C  2013,2016,2018
 ./bin/tests/system/allow-query/ns3/named.args  X       2018
-./bin/tests/system/allow-query/ns3/named1.conf.in      CONF-C  2018
-./bin/tests/system/allow-query/ns3/named2.conf.in      CONF-C  2018
-./bin/tests/system/allow-query/ns3/named3.conf.in      CONF-C  2018
-./bin/tests/system/allow-query/ns3/named4.conf.in      CONF-C  2018
 ./bin/tests/system/allow-query/setup.sh                SH      2010,2012,2016,2018
 ./bin/tests/system/allow-query/tests.sh                SH      2010,2012,2013,2016,2018
 ./bin/tests/system/ans.pl                      PERL    2011,2012,2014,2016,2017,2018
 ./bin/tests/system/auth/ns1/chaos.db           ZONE    2018
 ./bin/tests/system/auth/ns1/example.com.db     ZONE    2018
 ./bin/tests/system/auth/ns1/example.net.db     ZONE    2018
-./bin/tests/system/auth/ns1/named.conf.in      CONF-C  2018
-./bin/tests/system/auth/ns2/named.conf.in      CONF-C  2018
 ./bin/tests/system/auth/setup.sh               SH      2018
 ./bin/tests/system/auth/tests.sh               SH      2018
 ./bin/tests/system/autosign/clean.sh           SH      2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/autosign/ns1/keygen.sh      SH      2009,2010,2011,2012,2014,2016,2017,2018
-./bin/tests/system/autosign/ns1/named.conf.in  CONF-C  2009,2013,2016,2018
 ./bin/tests/system/autosign/ns1/root.db.in     ZONE    2009,2010,2016,2018
 ./bin/tests/system/autosign/ns2/Xbar.+005+30676.key    X       2010,2018
 ./bin/tests/system/autosign/ns2/Xbar.+005+30676.private        X       2010,2018
 ./bin/tests/system/autosign/ns2/example.db.in  ZONE    2009,2010,2016,2018
 ./bin/tests/system/autosign/ns2/insecure.secure.example.db     ZONE    2009,2016,2018
 ./bin/tests/system/autosign/ns2/keygen.sh      SH      2009,2010,2011,2012,2014,2015,2016,2017,2018
-./bin/tests/system/autosign/ns2/named.conf.in  CONF-C  2009,2010,2011,2013,2016,2018
 ./bin/tests/system/autosign/ns2/private.secure.example.db.in   ZONE    2009,2016,2018
 ./bin/tests/system/autosign/ns3/autonsec3.example.db.in        ZONE    2011,2016,2018
 ./bin/tests/system/autosign/ns3/delay.example.db       ZONE    2011,2016,2018
 ./bin/tests/system/autosign/ns3/insecure.example.db    ZONE    2009,2016,2018
 ./bin/tests/system/autosign/ns3/keygen.sh      SH      2009,2010,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/autosign/ns3/kskonly.example.db.in  ZONE    2017,2018
-./bin/tests/system/autosign/ns3/named.conf.in  CONF-C  2009,2010,2011,2012,2013,2015,2016,2017,2018
 ./bin/tests/system/autosign/ns3/nozsk.example.db.in    ZONE    2011,2016,2018
 ./bin/tests/system/autosign/ns3/nsec.example.db.in     ZONE    2010,2016,2018
 ./bin/tests/system/autosign/ns3/nsec3-to-nsec.example.db.in    ZONE    2010,2016,2018
 ./bin/tests/system/autosign/ns3/ttl2.example.db.in     ZONE    2011,2016,2018
 ./bin/tests/system/autosign/ns3/ttl3.example.db.in     ZONE    2011,2016,2018
 ./bin/tests/system/autosign/ns3/ttl4.example.db.in     ZONE    2011,2016,2018
-./bin/tests/system/autosign/ns4/named.conf.in  CONF-C  2009,2016,2017,2018
-./bin/tests/system/autosign/ns5/named.conf.in  CONF-C  2009,2016,2017,2018
 ./bin/tests/system/autosign/setup.sh           SH      2009,2010,2012,2014,2016,2017,2018
 ./bin/tests/system/autosign/tests.sh           SH      2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/builtin/clean.sh            SH      2014,2016,2018
-./bin/tests/system/builtin/ns1/named.conf.in   CONF-C  2011,2016,2018
-./bin/tests/system/builtin/ns2/named.conf.in   CONF-C  2014,2016,2018
-./bin/tests/system/builtin/ns3/named.conf.in   CONF-C  2014,2016,2018
 ./bin/tests/system/builtin/setup.sh            SH      2018
 ./bin/tests/system/builtin/tests.sh            SH      2011,2012,2014,2015,2016,2018
 ./bin/tests/system/cacheclean/clean.sh         SH      2001,2004,2007,2011,2012,2014,2015,2016,2018
 ./bin/tests/system/cacheclean/ns1/example.db   ZONE    2001,2004,2007,2012,2016,2018
 ./bin/tests/system/cacheclean/ns1/expire-test.db       ZONE    2014,2016,2018
 ./bin/tests/system/cacheclean/ns1/flushtest.db ZONE    2011,2016,2018
-./bin/tests/system/cacheclean/ns1/named.conf.in        CONF-C  2001,2004,2005,2007,2011,2014,2016,2017,2018
-./bin/tests/system/cacheclean/ns2/named.conf.in        CONF-C  2001,2004,2005,2007,2011,2013,2014,2015,2016,2018
 ./bin/tests/system/cacheclean/setup.sh         SH      2018
 ./bin/tests/system/cacheclean/tests.sh         SH      2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/case/clean.sh               SH      2013,2014,2015,2016,2018
 ./bin/tests/system/case/dynamic.good           X       2015,2018
 ./bin/tests/system/case/ns1/dynamic.db.in      ZONE    2015,2016,2018
 ./bin/tests/system/case/ns1/example.db         ZONE    2013,2016,2018
-./bin/tests/system/case/ns1/named.conf.in      CONF-C  2013,2015,2016,2017,2018
-./bin/tests/system/case/ns2/named.conf.in      CONF-C  2014,2015,2016,2017,2018
 ./bin/tests/system/case/postns1.good           X       2015,2018
 ./bin/tests/system/case/postupdate.good                X       2015,2018
 ./bin/tests/system/case/setup.sh               SH      2015,2016,2018
 ./bin/tests/system/case/tests.sh               SH      2013,2014,2015,2016,2018
 ./bin/tests/system/catz/clean.sh               SH      2016,2018
 ./bin/tests/system/catz/ns1/catalog.example.db.in      ZONE    2016,2018
-./bin/tests/system/catz/ns1/named.conf.in      CONF-C  2016,2017,2018
-./bin/tests/system/catz/ns2/named.conf.in      CONF-C  2016,2017,2018
 ./bin/tests/system/catz/ns3/dom5.example.db    ZONE    2016,2018
 ./bin/tests/system/catz/ns3/dom6.example.db    ZONE    2016,2018
-./bin/tests/system/catz/ns3/named.conf.in      CONF-C  2016,2018
 ./bin/tests/system/catz/setup.sh               SH      2016,2018
 ./bin/tests/system/catz/tests.sh               SH      2016,2017,2018
 ./bin/tests/system/cds/checkmtime.pl           PERL    2017,2018
 ./bin/tests/system/chain/ans4/README.anspy     TXT.BRIEF       2017,2018
 ./bin/tests/system/chain/ans4/ans.py           PYTHON  2017,2018
 ./bin/tests/system/chain/clean.sh              SH      2011,2012,2014,2015,2016,2017,2018
-./bin/tests/system/chain/ns1/named.conf.in     CONF-C  2011,2016,2017,2018
 ./bin/tests/system/chain/ns1/root.db           ZONE    2011,2016,2017,2018
 ./bin/tests/system/chain/ns2/example.db                ZONE    2011,2016,2017,2018
 ./bin/tests/system/chain/ns2/generic.db                ZONE    2017,2018
-./bin/tests/system/chain/ns2/named.conf.in     CONF-C  2011,2016,2017,2018
 ./bin/tests/system/chain/ns2/sign.sh           SH      2017,2018
 ./bin/tests/system/chain/ns2/sub.db            ZONE    2017,2018
-./bin/tests/system/chain/ns5/named.conf.in     CONF-C  2017,2018
 ./bin/tests/system/chain/ns5/sub.db            ZONE    2017,2018
-./bin/tests/system/chain/ns7/named.conf.in     CONF-C  2017,2018
 ./bin/tests/system/chain/ns7/root.hint         ZONE    2017,2018
 ./bin/tests/system/chain/prereq.sh             SH      2017,2018
 ./bin/tests/system/chain/setup.sh              SH      2017,2018
 ./bin/tests/system/chain/tests.sh              SH      2011,2012,2016,2017,2018
-./bin/tests/system/checkconf/altdb.conf                CONF-C  2014,2016,2018
-./bin/tests/system/checkconf/altdlz.conf       CONF-C  2014,2016,2018
-./bin/tests/system/checkconf/bad-acl.conf      CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-also-notify.conf      CONF-C  2012,2013,2016,2018
-./bin/tests/system/checkconf/bad-catz-zone.conf        CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-dnskey-validity.conf  CONF-C  2018
-./bin/tests/system/checkconf/bad-dnssec.conf   CONF-C  2012,2013,2016,2018
-./bin/tests/system/checkconf/bad-geoip-use-ecs.conf    CONF-C  2018
-./bin/tests/system/checkconf/bad-glue-cache-bogus.conf CONF-C  2017,2018
-./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
-./bin/tests/system/checkconf/bad-lmdb-mapsize-toolarge.conf    CONF-C  2017,2018
-./bin/tests/system/checkconf/bad-lmdb-mapsize-toosmall.conf    CONF-C  2017,2018
-./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-mirror-allow-recursion-none.conf      CONF-C  2018
-./bin/tests/system/checkconf/bad-mirror-explicit-notify-yes.conf       CONF-C  2018
-./bin/tests/system/checkconf/bad-mirror-non-root-zone-without-masters.conf     CONF-C  2018
-./bin/tests/system/checkconf/bad-mirror-recursion-no.conf      CONF-C  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
-./bin/tests/system/checkconf/bad-printtime.conf        CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-acl.conf   CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-all-per-second.conf        CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-errors-per-second.conf     CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-ipv4-prefix-length.conf    CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-ipv6-prefix-length.conf    CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-max-table-size.conf        CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-nodata-per-second.conf     CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-nxdomains-per-second.conf  CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-qps-scale.conf     CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-referrals-per-second.conf  CONF-C  2016,2018
-./bin/tests/system/checkconf/bad-rate-limit-responses-per-second.conf  CONF-C  2016,2018
-./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
-./bin/tests/system/checkconf/bad-sharedzone1.conf      CONF-C  2013,2016,2018
-./bin/tests/system/checkconf/bad-sharedzone2.conf      CONF-C  2013,2016,2018
-./bin/tests/system/checkconf/bad-sharedzone3.conf      CONF-C  2018
-./bin/tests/system/checkconf/bad-sig-validity.conf     CONF-C  2018
-./bin/tests/system/checkconf/bad-tsig.conf     CONF-C  2012,2013,2016,2018
-./bin/tests/system/checkconf/bad-update-policy1.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy10.conf  CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy11.conf  CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy12.conf  CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy13.conf  CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy14.conf  CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy15.conf  CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy2.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy3.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy4.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy5.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy6.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy7.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy8.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-update-policy9.conf   CONF-C  2018
-./bin/tests/system/checkconf/bad-view-also-notify.conf CONF-C  2016,2018
-./bin/tests/system/checkconf/check-dlv-ksk-key.conf    CONF-C  2018
-./bin/tests/system/checkconf/check-dup-records-fail.conf       CONF-C  2014,2016,2018
 ./bin/tests/system/checkconf/check-dup-records.db      ZONE    2014,2016,2018
-./bin/tests/system/checkconf/check-mx-cname-fail.conf  CONF-C  2014,2016,2018
 ./bin/tests/system/checkconf/check-mx-cname.db ZONE    2014,2016,2018
-./bin/tests/system/checkconf/check-mx-fail.conf        CONF-C  2014,2016,2018
 ./bin/tests/system/checkconf/check-mx.db       ZONE    2014,2016,2018
-./bin/tests/system/checkconf/check-names-fail.conf     CONF-C  2014,2016,2018
 ./bin/tests/system/checkconf/check-names.db    ZONE    2014,2016,2018
-./bin/tests/system/checkconf/check-root-ksk-2010.conf  CONF-C  2018
-./bin/tests/system/checkconf/check-root-ksk-2017.conf  CONF-C  2018
-./bin/tests/system/checkconf/check-root-ksk-both.conf  CONF-C  2018
-./bin/tests/system/checkconf/check-srv-cname-fail.conf CONF-C  2014,2016,2018
 ./bin/tests/system/checkconf/check-srv-cname.db        ZONE    2014,2016,2018
 ./bin/tests/system/checkconf/clean.sh          SH      2011,2012,2013,2014,2016,2018
-./bin/tests/system/checkconf/dlz-bad.conf      CONF-C  2012,2013,2016,2018
-./bin/tests/system/checkconf/dnssec.1          CONF-C  2011,2016,2018
-./bin/tests/system/checkconf/dnssec.2          CONF-C  2011,2016,2018
-./bin/tests/system/checkconf/dnssec.3          CONF-C  2011,2016,2017,2018
-./bin/tests/system/checkconf/good-acl.conf     CONF-C  2016,2018
-./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-mirror-inherited-notify-yes.conf     CONF-C  2018
-./bin/tests/system/checkconf/good-mirror-root-zone-without-masters.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
-./bin/tests/system/checkconf/good-update-policy12.conf CONF-C  2018
-./bin/tests/system/checkconf/good-update-policy2.conf  CONF-C  2018
-./bin/tests/system/checkconf/good-update-policy3.conf  CONF-C  2018
-./bin/tests/system/checkconf/good-update-policy4.conf  CONF-C  2018
-./bin/tests/system/checkconf/good-update-policy5.conf  CONF-C  2018
-./bin/tests/system/checkconf/good-update-policy6.conf  CONF-C  2018
-./bin/tests/system/checkconf/good-update-policy7.conf  CONF-C  2018
-./bin/tests/system/checkconf/good-update-policy8.conf  CONF-C  2018
-./bin/tests/system/checkconf/good-update-policy9.conf  CONF-C  2018
-./bin/tests/system/checkconf/good-view-also-notify.conf        CONF-C  2016,2018
-./bin/tests/system/checkconf/good.conf         CONF-C  2005,2007,2010,2011,2012,2013,2014,2015,2016,2017,2018
+./bin/tests/system/checkconf/dnssec.1          X       2011,2016,2018
+./bin/tests/system/checkconf/dnssec.2          X       2011,2016,2018
+./bin/tests/system/checkconf/dnssec.3          X       2011,2016,2017,2018
 ./bin/tests/system/checkconf/good.zonelist     X       2016,2017,2018
-./bin/tests/system/checkconf/hint-nofile.conf  CONF-C  2013,2016,2018
-./bin/tests/system/checkconf/in-view-good.conf CONF-C  2015,2016,2018
-./bin/tests/system/checkconf/inline-bad.conf   CONF-C  2013,2016,2018
-./bin/tests/system/checkconf/inline-good.conf  CONF-C  2013,2016,2018
-./bin/tests/system/checkconf/inline-no.conf    CONF-C  2013,2016,2018
-./bin/tests/system/checkconf/max-cache-size-good.conf  CONF-C  2015,2016,2018
-./bin/tests/system/checkconf/max-ttl.conf      CONF-C  2014,2016,2018
-./bin/tests/system/checkconf/maxttl-bad.conf   CONF-C  2014,2016,2018
 ./bin/tests/system/checkconf/maxttl-bad.db     ZONE    2014,2016,2018
 ./bin/tests/system/checkconf/maxttl.db         ZONE    2014,2016,2018
-./bin/tests/system/checkconf/notify.conf       CONF-C  2014,2016,2018
-./bin/tests/system/checkconf/portrange-good.conf       CONF-C  2015,2016,2018
-./bin/tests/system/checkconf/range.conf                CONF-C  2013,2016,2018
 ./bin/tests/system/checkconf/shared.example.db ZONE    2015,2016,2018
 ./bin/tests/system/checkconf/tests.sh          SH      2005,2007,2010,2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/checkconf/view-class-any1.conf      CONF-C  2016,2018
-./bin/tests/system/checkconf/view-class-any2.conf      CONF-C  2016,2018
-./bin/tests/system/checkconf/view-class-in1.conf       CONF-C  2016,2018
-./bin/tests/system/checkconf/view-class-in2.conf       CONF-C  2016,2018
-./bin/tests/system/checkconf/warn-dlv-auto.conf        CONF-C  2017,2018
-./bin/tests/system/checkconf/warn-dlv-dlv.isc.org.conf CONF-C  2017,2018
-./bin/tests/system/checkconf/warn-geoip-use-ecs.conf   CONF-C  2018
-./bin/tests/system/checkconf/warn-keydir.conf  CONF-C  2013,2016,2018
 ./bin/tests/system/checkds/clean.sh            SH      2012,2013,2014,2016,2017,2018
 ./bin/tests/system/checkds/dig.bat             BAT     2016,2018
 ./bin/tests/system/checkds/dig.pl              PERL    2014,2016,2017,2018
 ./bin/tests/system/checknames/ns1/fail.update.db.in    ZONE    2004,2007,2016,2018
 ./bin/tests/system/checknames/ns1/ignore.example.db.in ZONE    2004,2007,2016,2018
 ./bin/tests/system/checknames/ns1/ignore.update.db.in  ZONE    2004,2007,2016,2018
-./bin/tests/system/checknames/ns1/named.conf.in        CONF-C  2004,2005,2007,2016,2018
 ./bin/tests/system/checknames/ns1/root.db      ZONE    2004,2007,2016,2018
 ./bin/tests/system/checknames/ns1/warn.example.db.in   ZONE    2004,2007,2016,2018
 ./bin/tests/system/checknames/ns1/warn.update.db.in    ZONE    2004,2007,2016,2018
-./bin/tests/system/checknames/ns2/named.conf.in        CONF-C  2004,2007,2016,2017,2018
 ./bin/tests/system/checknames/ns2/root.hints   ZONE    2004,2007,2016,2018
-./bin/tests/system/checknames/ns3/named.conf.in        CONF-C  2004,2007,2016,2017,2018
 ./bin/tests/system/checknames/ns3/root.hints   ZONE    2004,2007,2016,2018
 ./bin/tests/system/checknames/ns4/master-ignore.update.db.in   ZONE    2014,2016,2018
-./bin/tests/system/checknames/ns4/named.conf.in        CONF-C  2014,2016,2017,2018
 ./bin/tests/system/checknames/ns4/root.hints   ZONE    2014,2016,2018
 ./bin/tests/system/checknames/setup.sh         SH      2004,2007,2012,2014,2016,2018
 ./bin/tests/system/checknames/tests.sh         SH      2004,2007,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/clean.sh                    SH      2015,2016,2018
 ./bin/tests/system/cleanall.sh                 SH      2000,2001,2004,2007,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/cleanpkcs11.sh              SH      2010,2012,2014,2016,2018
-./bin/tests/system/common/controls.conf                CONF-C  2000,2001,2004,2007,2013,2016,2018
-./bin/tests/system/common/controls.conf.in     CONF-C  2000,2001,2004,2007,2013,2016,2018
-./bin/tests/system/common/rndc.conf            CONF-C  2000,2001,2004,2007,2013,2016,2018
-./bin/tests/system/common/rndc.key             CONF-C  2011,2013,2016,2018
+./bin/tests/system/common/rndc.key             X       2011,2013,2016,2018
 ./bin/tests/system/common/root.hint            ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/conf.sh.in                  SH      2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/conf.sh.win32               SH      2016,2017,2018
-./bin/tests/system/cookie/bad-cookie-badhex.conf       CONF-C  2014,2015,2016,2018
-./bin/tests/system/cookie/bad-cookie-badsha1.conf      CONF-C  2017,2018
-./bin/tests/system/cookie/bad-cookie-badsha256.conf    CONF-C  2017,2018
-./bin/tests/system/cookie/bad-cookie-toolong.conf      CONF-C  2014,2015,2016,2018
 ./bin/tests/system/cookie/clean.sh             SH      2014,2015,2016,2018
-./bin/tests/system/cookie/good-cookie-sha1.conf        CONF-C  2017,2018
-./bin/tests/system/cookie/good-cookie-sha256.conf      CONF-C  2017,2018
 ./bin/tests/system/cookie/ns1/example.db       ZONE    2014,2015,2016,2018
-./bin/tests/system/cookie/ns1/named.conf.in    CONF-C  2014,2015,2016,2017,2018
 ./bin/tests/system/cookie/ns1/root.hint                ZONE    2014,2015,2016,2018
-./bin/tests/system/cookie/ns2/named.conf.in    CONF-C  2014,2015,2016,2017,2018
 ./bin/tests/system/cookie/ns2/root.db          ZONE    2014,2015,2016,2018
-./bin/tests/system/cookie/ns3/named.conf.in    CONF-C  2015,2016,2017,2018
 ./bin/tests/system/cookie/ns3/root.hint                ZONE    2015,2016,2018
-./bin/tests/system/cookie/ns4/named.conf.in    CONF-C  2017,2018
 ./bin/tests/system/cookie/ns4/root.hint                ZONE    2017,2018
-./bin/tests/system/cookie/ns5/named.conf.in    CONF-C  2017,2018
 ./bin/tests/system/cookie/ns5/root.hint                ZONE    2017,2018
-./bin/tests/system/cookie/ns6/named.conf.in    CONF-C  2017,2018
 ./bin/tests/system/cookie/ns6/root.hint                ZONE    2017,2018
-./bin/tests/system/cookie/ns7/named.conf.in    CONF-C  2018
 ./bin/tests/system/cookie/ns7/root.db          ZONE    2018
 ./bin/tests/system/cookie/ns8/example.db       ZONE    2018
-./bin/tests/system/cookie/ns8/named.conf.in    CONF-C  2018
 ./bin/tests/system/cookie/setup.sh             SH      2018
 ./bin/tests/system/cookie/tests.sh             SH      2014,2015,2016,2017,2018
 ./bin/tests/system/coverage/01-ksk-inactive/README     X       2013,2018
 ./bin/tests/system/coverage/setup.sh           SH      2013,2014,2016,2017,2018
 ./bin/tests/system/coverage/tests.sh           SH      2013,2014,2016,2018
 ./bin/tests/system/database/clean.sh           SH      2011,2012,2014,2016,2018
-./bin/tests/system/database/ns1/named1.conf.in CONF-C  2011,2013,2016,2018
-./bin/tests/system/database/ns1/named2.conf.in CONF-C  2011,2013,2016,2018
 ./bin/tests/system/database/setup.sh           SH      2011,2012,2016,2018
 ./bin/tests/system/database/tests.sh           SH      2011,2012,2016,2018
 ./bin/tests/system/delzone/clean.sh            SH      2016,2018
 ./bin/tests/system/delzone/ns1/inlineslave.db  ZONE    2016,2018
-./bin/tests/system/delzone/ns1/named.conf      CONF-C  2016,2018
 ./bin/tests/system/delzone/ns2/added.db                ZONE    2016,2018
 ./bin/tests/system/delzone/ns2/named.args      X       2016,2018
-./bin/tests/system/delzone/ns2/named.conf      CONF-C  2016,2018
 ./bin/tests/system/delzone/ns2/normal.db       ZONE    2016,2018
 ./bin/tests/system/delzone/setup.sh            SH      2016,2018
 ./bin/tests/system/delzone/tests.sh            SH      2016,2018
 ./bin/tests/system/dialup/ns1/example.db       ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/dialup/ns1/named.conf       CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/dialup/ns1/root.db          ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/dialup/ns2/hint.db          ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/dialup/ns2/named.conf       CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/dialup/ns3/hint.db          ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/dialup/ns3/named.conf       CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/dialup/setup.sh             SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/dialup/tests.sh             SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/digcomp.pl                  PERL    2000,2001,2004,2007,2012,2013,2016,2018
 ./bin/tests/system/digdelv/ans4/startme                X       2017,2018
 ./bin/tests/system/digdelv/clean.sh            SH      2015,2016,2018
-./bin/tests/system/digdelv/ns1/named.conf.in   CONF-C  2015,2016,2018
 ./bin/tests/system/digdelv/ns1/root.db         ZONE    2015,2016,2018
 ./bin/tests/system/digdelv/ns2/example.db      ZONE    2015,2016,2018
-./bin/tests/system/digdelv/ns2/named.conf.in   CONF-C  2015,2016,2018
-./bin/tests/system/digdelv/ns3/named.conf.in   CONF-C  2015,2016,2017,2018
 ./bin/tests/system/digdelv/prereq.sh           SH      2018
 ./bin/tests/system/digdelv/setup.sh            SH      2018
 ./bin/tests/system/digdelv/tests.sh            SH      2015,2016,2017,2018
 ./bin/tests/system/ditch.pl                    PERL    2015,2016,2018
 ./bin/tests/system/dlv/clean.sh                        SH      2004,2007,2010,2011,2012,2014,2016,2018
-./bin/tests/system/dlv/ns1/named.conf.in       CONF-C  2004,2007,2011,2016,2018
 ./bin/tests/system/dlv/ns1/root.db.in          ZONE    2011,2016,2018
 ./bin/tests/system/dlv/ns1/rootservers.utld.db ZONE    2004,2007,2016,2018
 ./bin/tests/system/dlv/ns1/sign.sh             SH      2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/ns2/druz.db.in          ZONE    2011,2016,2018
 ./bin/tests/system/dlv/ns2/hints               ZONE    2004,2007,2016,2018
-./bin/tests/system/dlv/ns2/named.conf.in       CONF-C  2004,2007,2011,2016,2018
 ./bin/tests/system/dlv/ns2/sign.sh             SH      2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/ns2/utld.db             ZONE    2004,2007,2016,2018
 ./bin/tests/system/dlv/ns3/child.db.in         ZONE    2004,2007,2010,2016,2018
 ./bin/tests/system/dlv/ns3/dlv.db.in           ZONE    2004,2007,2016,2018
 ./bin/tests/system/dlv/ns3/hints               ZONE    2004,2007,2016,2018
-./bin/tests/system/dlv/ns3/named.conf.in       CONF-C  2004,2007,2011,2016,2018
 ./bin/tests/system/dlv/ns3/sign.sh             SH      2004,2007,2009,2010,2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/ns4/child.db            ZONE    2004,2007,2016,2018
 ./bin/tests/system/dlv/ns4/hints               ZONE    2004,2007,2016,2018
-./bin/tests/system/dlv/ns4/named.conf.in       CONF-C  2004,2007,2016,2018
 ./bin/tests/system/dlv/ns5/hints               ZONE    2004,2007,2016,2018
-./bin/tests/system/dlv/ns5/named.conf.in       CONF-C  2004,2006,2007,2011,2013,2016,2017,2018
-./bin/tests/system/dlv/ns5/rndc.conf           CONF-C  2004,2007,2013,2016,2018
 ./bin/tests/system/dlv/ns6/child.db.in         ZONE    2010,2016,2018
 ./bin/tests/system/dlv/ns6/hints               ZONE    2010,2016,2018
-./bin/tests/system/dlv/ns6/named.conf.in       CONF-C  2010,2011,2016,2018
 ./bin/tests/system/dlv/ns6/sign.sh             SH      2010,2011,2012,2014,2016,2018
 ./bin/tests/system/dlv/setup.sh                        SH      2004,2007,2009,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/dlv/tests.sh                        SH      2004,2007,2010,2011,2012,2016,2018
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/NS=10=example.com.=    TXT.BRIEF       2010,2016,2018
 ./bin/tests/system/dlz/ns1/dns-root/com/example/dns.d/@/SOA=10=ns.example.com.=root.example.com.=2010062900=0=0=0=10=  TXT.BRIEF       2010,2016,2018
 ./bin/tests/system/dlz/ns1/dns-root/com/example/xfr.d/10.53.0.1        TXT.BRIEF       2010,2016,2018
-./bin/tests/system/dlz/ns1/named.conf.in       CONF-C  2010,2012,2016,2018
 ./bin/tests/system/dlz/prereq.sh.in            SH      2011,2012,2016,2018
 ./bin/tests/system/dlz/setup.sh                        SH      2018
 ./bin/tests/system/dlz/tests.sh                        SH      2010,2011,2012,2013,2015,2016,2018
 ./bin/tests/system/dlzexternal/clean.sh                SH      2010,2012,2014,2015,2016,2018
 ./bin/tests/system/dlzexternal/driver.c                C       2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/dlzexternal/driver.h                C       2011,2016,2018
-./bin/tests/system/dlzexternal/ns1/dlzs.conf.in        CONF-C  2018
-./bin/tests/system/dlzexternal/ns1/named.conf.in       CONF-C  2011,2012,2013,2014,2016,2018
 ./bin/tests/system/dlzexternal/ns1/root.db     ZONE    2014,2016,2018
 ./bin/tests/system/dlzexternal/prereq.sh       SH      2010,2011,2012,2014,2016,2018
 ./bin/tests/system/dlzexternal/setup.sh                SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/dlzexternal/tests.sh                SH      2010,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/dns64/clean.sh              SH      2010,2012,2014,2015,2016,2018
-./bin/tests/system/dns64/conf/bad1.conf                CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/bad2.conf                CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/bad3.conf                CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/bad4.conf                CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/bad5.conf                CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/bad6.conf                CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/bad7.conf                CONF-C  2012,2016,2018
-./bin/tests/system/dns64/conf/bad8.conf                CONF-C  2012,2016,2018
-./bin/tests/system/dns64/conf/bad9.conf                CONF-C  2012,2016,2018
-./bin/tests/system/dns64/conf/good1.conf       CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/good2.conf       CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/good3.conf       CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/good4.conf       CONF-C  2010,2016,2018
-./bin/tests/system/dns64/conf/good5.conf       CONF-C  2010,2016,2018
 ./bin/tests/system/dns64/ns1/example.db                ZONE    2010,2011,2013,2016,2018
-./bin/tests/system/dns64/ns1/named.conf.in     CONF-C  2010,2016,2018
 ./bin/tests/system/dns64/ns1/root.db           ZONE    2010,2016,2018
 ./bin/tests/system/dns64/ns1/sign.sh           SH      2010,2012,2014,2016,2017,2018
-./bin/tests/system/dns64/ns2/named.conf.in     CONF-C  2010,2011,2013,2016,2018
 ./bin/tests/system/dns64/ns2/rpz.db            ZONE    2013,2016,2018
 ./bin/tests/system/dns64/setup.sh              SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/dns64/tests.sh              SH      2010,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/dnssec/README               TXT.BRIEF       2000,2001,2002,2004,2011,2016,2018
 ./bin/tests/system/dnssec/clean.sh             SH      2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/dnssec/dnssec_update_test.pl        PERL    2002,2004,2007,2010,2012,2016,2018
-./bin/tests/system/dnssec/ns1/named.conf.in    CONF-C  2000,2001,2004,2006,2007,2016,2018
 ./bin/tests/system/dnssec/ns1/root.db.in       ZONE    2000,2001,2004,2007,2010,2013,2014,2016,2018
 ./bin/tests/system/dnssec/ns1/sign.sh          SH      2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/dnssec/ns2/algroll.db.in    ZONE    2010,2016,2018
 ./bin/tests/system/dnssec/ns2/example.db.in    ZONE    2000,2001,2002,2004,2007,2008,2009,2010,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/dnssec/ns2/in-addr.arpa.db.in       ZONE    2014,2016,2018
 ./bin/tests/system/dnssec/ns2/insecure.secure.example.db       ZONE    2000,2001,2004,2007,2013,2016,2018
-./bin/tests/system/dnssec/ns2/named.conf.in    CONF-C  2000,2001,2002,2004,2006,2007,2008,2010,2011,2014,2015,2016,2017,2018
 ./bin/tests/system/dnssec/ns2/private.secure.example.db.in     ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/dnssec/ns2/rfc2335.example.db       X       2004,2018
 ./bin/tests/system/dnssec/ns2/sign.sh          SH      2000,2001,2002,2003,2004,2006,2007,2008,2009,2010,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/dnssec/ns3/lower.example.db.in      ZONE    2012,2016,2018
 ./bin/tests/system/dnssec/ns3/managed-future.example.db.in     ZONE    2016,2018
 ./bin/tests/system/dnssec/ns3/multiple.example.db.in   ZONE    2006,2008,2016,2018
-./bin/tests/system/dnssec/ns3/named.conf.in    CONF-C  2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/dnssec/ns3/nosign.example.db.in     ZONE    2011,2016,2018
 ./bin/tests/system/dnssec/ns3/nsec3-unknown.example.db.in      ZONE    2006,2008,2016,2018
 ./bin/tests/system/dnssec/ns3/nsec3.example.db.in      ZONE    2006,2008,2016,2018
 ./bin/tests/system/dnssec/ns3/secure.nsec3.example.db.in       ZONE    2008,2016,2018
 ./bin/tests/system/dnssec/ns3/secure.optout.example.db.in      ZONE    2008,2016,2018
 ./bin/tests/system/dnssec/ns3/siginterval.example.db.in        ZONE    2013,2016,2018
-./bin/tests/system/dnssec/ns3/siginterval1.conf        CONF-C  2013,2016,2018
-./bin/tests/system/dnssec/ns3/siginterval2.conf        CONF-C  2013,2016,2018
 ./bin/tests/system/dnssec/ns3/sign.sh          SH      2000,2001,2002,2004,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/dnssec/ns3/split-dnssec.example.db.in       ZONE    2011,2016,2018
 ./bin/tests/system/dnssec/ns3/split-smart.example.db.in        ZONE    2011,2016,2018
 ./bin/tests/system/dnssec/ns3/ttlpatch.example.db.in   ZONE    2011,2016,2018
 ./bin/tests/system/dnssec/ns3/update-nsec3.example.db.in       ZONE    2011,2016,2018
 ./bin/tests/system/dnssec/ns3/upper.example.db.in      ZONE    2012,2016,2018
-./bin/tests/system/dnssec/ns4/named1.conf.in   CONF-C  2011,2013,2014,2016,2017,2018
-./bin/tests/system/dnssec/ns4/named2.conf.in   CONF-C  2011,2013,2016,2017,2018
-./bin/tests/system/dnssec/ns4/named3.conf.in   CONF-C  2012,2013,2016,2017,2018
-./bin/tests/system/dnssec/ns4/named4.conf.in   CONF-C  2013,2016,2017,2018
-./bin/tests/system/dnssec/ns4/named5.conf.in   CONF-C  2018
 ./bin/tests/system/dnssec/ns5/.gitignore       X       2015,2018
-./bin/tests/system/dnssec/ns5/named1.conf.in   CONF-C  2000,2001,2004,2006,2007,2015,2016,2017,2018
-./bin/tests/system/dnssec/ns5/named2.conf.in   CONF-C  2000,2001,2004,2006,2007,2015,2016,2018
 ./bin/tests/system/dnssec/ns5/sign.sh          SH      2015,2016,2017,2018
-./bin/tests/system/dnssec/ns5/trusted.conf.bad CONF-C  2000,2001,2004,2007,2016,2018
+./bin/tests/system/dnssec/ns5/trusted.conf.bad X       2000,2001,2004,2007,2016,2018
 ./bin/tests/system/dnssec/ns6/named.args       X       2013,2014,2016,2018
-./bin/tests/system/dnssec/ns6/named.conf.in    CONF-C  2004,2006,2007,2013,2016,2017,2018
 ./bin/tests/system/dnssec/ns6/optout-tld.db.in ZONE    2013,2016,2018
 ./bin/tests/system/dnssec/ns6/sign.sh          SH      2013,2014,2016,2017,2018
-./bin/tests/system/dnssec/ns7/named.conf.in    CONF-C  2006,2008,2010,2014,2016,2018
 ./bin/tests/system/dnssec/ns7/named.nosoa      TXT.BRIEF       2010,2016,2018
 ./bin/tests/system/dnssec/ns7/nosoa.secure.example.db  ZONE    2010,2016,2018
 ./bin/tests/system/dnssec/ns7/sign.sh          SH      2014,2016,2017,2018
 ./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
-./bin/tests/system/dnstap/bad-fstrm-set-flush-timeout-min.conf CONF-C  2016,2018
-./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-max.conf      CONF-C  2016,2018
-./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-min.conf      CONF-C  2016,2018
-./bin/tests/system/dnstap/bad-fstrm-set-input-queue-size-po2.conf      CONF-C  2016,2018
-./bin/tests/system/dnstap/bad-fstrm-set-output-notify-threshold.conf   CONF-C  2016,2018
-./bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-max.conf     CONF-C  2016,2018
-./bin/tests/system/dnstap/bad-fstrm-set-output-queue-size-min.conf     CONF-C  2016,2018
-./bin/tests/system/dnstap/bad-fstrm-set-reopen-interval-max.conf       CONF-C  2016,2018
-./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
-./bin/tests/system/dnstap/good-fstrm-set-output-notify-threshold.conf  CONF-C  2016,2018
-./bin/tests/system/dnstap/good-fstrm-set-output-queue-model-mpsc.conf  CONF-C  2016,2018
-./bin/tests/system/dnstap/good-fstrm-set-output-queue-model-spsc.conf  CONF-C  2016,2018
-./bin/tests/system/dnstap/good-fstrm-set-output-queue-size.conf        CONF-C  2016,2018
-./bin/tests/system/dnstap/good-fstrm-set-reopen-interval.conf  CONF-C  2016,2018
-./bin/tests/system/dnstap/good-size-unlimited.conf     CONF-C  2017,2018
-./bin/tests/system/dnstap/good-size-version.conf       CONF-C  2017,2018
-./bin/tests/system/dnstap/ns1/named.conf.in    CONF-C  2015,2016,2017,2018
 ./bin/tests/system/dnstap/ns1/root.db          ZONE    2015,2016,2018
 ./bin/tests/system/dnstap/ns2/example.db.in    ZONE    2015,2016,2018
-./bin/tests/system/dnstap/ns2/named.conf.in    CONF-C  2015,2016,2017,2018
-./bin/tests/system/dnstap/ns3/named.conf.in    CONF-C  2015,2016,2017,2018
-./bin/tests/system/dnstap/ns4/named.conf.in    CONF-C  2016,2018
 ./bin/tests/system/dnstap/setup.sh             SH      2018
 ./bin/tests/system/dnstap/tests.sh             SH      2015,2016,2017,2018
 ./bin/tests/system/dnstap/ydump.py             PYTHON  2016,2017,2018
 ./bin/tests/system/dscp/clean.sh               SH      2013,2014,2015,2016,2018
 ./bin/tests/system/dscp/ns1/named.args         X       2013,2014,2018
-./bin/tests/system/dscp/ns1/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/dscp/ns1/root.db            ZONE    2013,2016,2018
 ./bin/tests/system/dscp/ns2/named.args         X       2013,2014,2018
-./bin/tests/system/dscp/ns2/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/dscp/ns3/hint.db            ZONE    2013,2016,2018
 ./bin/tests/system/dscp/ns3/named.args         X       2013,2014,2018
-./bin/tests/system/dscp/ns3/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/dscp/ns4/named.args         X       2013,2014,2018
-./bin/tests/system/dscp/ns4/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/dscp/ns4/root.db            ZONE    2013,2016,2018
 ./bin/tests/system/dscp/ns5/named.args         X       2013,2014,2018
-./bin/tests/system/dscp/ns5/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/dscp/ns6/hint.db            ZONE    2013,2016,2018
 ./bin/tests/system/dscp/ns6/named.args         X       2013,2014,2018
-./bin/tests/system/dscp/ns6/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/dscp/ns7/named.args         X       2013,2014,2018
-./bin/tests/system/dscp/ns7/named.conf.in      CONF-C  2013,2016,2018
 ./bin/tests/system/dscp/setup.sh               SH      2018
 ./bin/tests/system/dscp/tests.sh               SH      2013,2016,2018
 ./bin/tests/system/dsdigest/clean.sh           SH      2012,2014,2016,2018
-./bin/tests/system/dsdigest/ns1/named.conf.in  CONF-C  2012,2016,2018
 ./bin/tests/system/dsdigest/ns1/root.db.in     ZONE    2012,2016,2018
 ./bin/tests/system/dsdigest/ns1/sign.sh                SH      2012,2014,2016,2018
 ./bin/tests/system/dsdigest/ns2/bad.db.in      ZONE    2012,2016,2018
 ./bin/tests/system/dsdigest/ns2/good.db.in     ZONE    2012,2016,2018
-./bin/tests/system/dsdigest/ns2/named.conf.in  CONF-C  2012,2016,2018
 ./bin/tests/system/dsdigest/ns2/sign.sh                SH      2012,2014,2016,2018
-./bin/tests/system/dsdigest/ns3/named.conf.in  CONF-C  2012,2016,2018
-./bin/tests/system/dsdigest/ns4/named.conf.in  CONF-C  2012,2016,2018
 ./bin/tests/system/dsdigest/setup.sh           SH      2012,2014,2016,2017,2018
 ./bin/tests/system/dsdigest/tests.sh           SH      2012,2016,2018
 ./bin/tests/system/dupsigs/check_journal.pl    PERL    2018
 ./bin/tests/system/dupsigs/clean.sh            SH      2018
 ./bin/tests/system/dupsigs/ns1/named.args      X       2018
-./bin/tests/system/dupsigs/ns1/named.conf.in   CONF-C  2018
 ./bin/tests/system/dupsigs/ns1/reset_keys.sh   SH      2018
 ./bin/tests/system/dupsigs/ns1/signing.test.db.in      ZONE    2018
 ./bin/tests/system/dupsigs/setup.sh            SH      2018
 ./bin/tests/system/dyndb/driver/util.h         X       2015,2018
 ./bin/tests/system/dyndb/driver/zone.c         X       2015,2018
 ./bin/tests/system/dyndb/driver/zone.h         X       2015,2018
-./bin/tests/system/dyndb/ns1/named.conf.in     CONF-C  2015,2016,2018
 ./bin/tests/system/dyndb/prereq.sh             SH      2015,2016,2018
 ./bin/tests/system/dyndb/setup.sh              SH      2018
 ./bin/tests/system/dyndb/tests.sh              SH      2015,2016,2018
 ./bin/tests/system/ecdsa/clean.sh              SH      2012,2014,2016,2018
-./bin/tests/system/ecdsa/ns1/named.conf                CONF-C  2012,2016,2018
 ./bin/tests/system/ecdsa/ns1/root.db.in                ZONE    2012,2016,2018
 ./bin/tests/system/ecdsa/ns1/sign.sh           SH      2012,2014,2016,2018
-./bin/tests/system/ecdsa/ns2/named.conf                CONF-C  2012,2016,2018
 ./bin/tests/system/ecdsa/setup.sh              SH      2012,2014,2016,2017,2018
 ./bin/tests/system/ecdsa/tests.sh              SH      2012,2013,2015,2016,2018
 ./bin/tests/system/eddsa/clean.sh              SH      2017,2018
-./bin/tests/system/eddsa/ns1/named.conf                CONF-C  2017,2018
 ./bin/tests/system/eddsa/ns1/root.db.in                ZONE    2017,2018
 ./bin/tests/system/eddsa/ns1/sign.sh           SH      2017,2018
 ./bin/tests/system/eddsa/ns2/Xexample.com.+015+03613.key       X       2017,2018
 ./bin/tests/system/eddsa/ns2/Xexample.com.+015+35217.key       X       2017,2018
 ./bin/tests/system/eddsa/ns2/Xexample.com.+015+35217.private   X       2017,2018
 ./bin/tests/system/eddsa/ns2/example.com.db    ZONE    2017,2018
-./bin/tests/system/eddsa/ns2/named.conf                CONF-C  2017,2018
 ./bin/tests/system/eddsa/ns2/sign.sh           SH      2017,2018
 ./bin/tests/system/eddsa/prereq.sh             SH      2017,2018
 ./bin/tests/system/eddsa/setup.sh              SH      2017,2018
 ./bin/tests/system/eddsa/tests.sh              SH      2017,2018
 ./bin/tests/system/ednscompliance/clean.sh     SH      2014,2015,2016,2018
-./bin/tests/system/ednscompliance/ns1/named.conf.in    CONF-C  2014,2016,2018
 ./bin/tests/system/ednscompliance/ns1/root.db  ZONE    2014,2016,2018
 ./bin/tests/system/ednscompliance/setup.sh     SH      2018
 ./bin/tests/system/ednscompliance/tests.sh     SH      2014,2015,2016,2018
 ./bin/tests/system/emptyzones/clean.sh         SH      2014,2015,2016,2018
 ./bin/tests/system/emptyzones/ns1/empty.db     ZONE    2014,2016,2018
-./bin/tests/system/emptyzones/ns1/named1.conf.in       CONF-C  2014,2016,2017,2018
-./bin/tests/system/emptyzones/ns1/named2.conf.in       CONF-C  2014,2015,2016,2017,2018
-./bin/tests/system/emptyzones/ns1/rfc1918.zones        CONF-C  2014,2016,2018
+./bin/tests/system/emptyzones/ns1/rfc1918.zones        X       2014,2016,2018
 ./bin/tests/system/emptyzones/ns1/root.hint    ZONE    2014,2016,2018
 ./bin/tests/system/emptyzones/setup.sh         SH      2014,2016,2018
 ./bin/tests/system/emptyzones/tests.sh         SH      2014,2015,2016,2018
 ./bin/tests/system/feature-test.c              C       2016,2017,2018
 ./bin/tests/system/fetchlimit/ans4/ans.pl      PERL    2015,2016,2018
 ./bin/tests/system/fetchlimit/clean.sh         SH      2015,2016,2018
-./bin/tests/system/fetchlimit/ns1/named.conf.in        CONF-C  2015,2016,2018
 ./bin/tests/system/fetchlimit/ns1/root.db      ZONE    2015,2016,2018
 ./bin/tests/system/fetchlimit/ns2/example.db   ZONE    2015,2016,2018
-./bin/tests/system/fetchlimit/ns2/named.conf.in        CONF-C  2015,2016,2018
 ./bin/tests/system/fetchlimit/ns3/named.args   X       2015,2018
-./bin/tests/system/fetchlimit/ns3/named1.conf.in       CONF-C  2015,2016,2018
-./bin/tests/system/fetchlimit/ns3/named2.conf.in       CONF-C  2015,2016,2018
-./bin/tests/system/fetchlimit/ns3/named3.conf.in       CONF-C  2015,2016,2018
 ./bin/tests/system/fetchlimit/ns3/root.hint    ZONE    2015,2016,2018
 ./bin/tests/system/fetchlimit/prereq.sh                SH      2018
 ./bin/tests/system/fetchlimit/setup.sh         SH      2015,2016,2018
 ./bin/tests/system/fetchlimit/tests.sh         SH      2015,2016,2018
 ./bin/tests/system/filter-aaaa/clean.sh                SH      2010,2012,2014,2016,2018
-./bin/tests/system/filter-aaaa/conf/bad1.conf  CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/bad2.conf  CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/bad3.conf  CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/bad4.conf  CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/bad5.conf  CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/bad6.conf  CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/good1.conf CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/good2.conf CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/good3.conf CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/good4.conf CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/good5.conf CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/good6.conf CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/good7.conf CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/conf/good8.conf CONF-C  2010,2016,2018
-./bin/tests/system/filter-aaaa/ns1/named1.conf.in      CONF-C  2012,2013,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns1/named2.conf.in      CONF-C  2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns1/root.db     ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns1/sign.sh     SH      2010,2012,2014,2016,2018
 ./bin/tests/system/filter-aaaa/ns1/signed.db.in        ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns1/unsigned.db ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns2/hints       ZONE    2010,2016,2018
-./bin/tests/system/filter-aaaa/ns2/named1.conf.in      CONF-C  2012,2013,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns2/named2.conf.in      CONF-C  2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns3/hints       ZONE    2010,2016,2018
-./bin/tests/system/filter-aaaa/ns3/named1.conf.in      CONF-C  2012,2013,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns3/named2.conf.in      CONF-C  2012,2013,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns4/named1.conf.in      CONF-C  2012,2013,2016,2017,2018
-./bin/tests/system/filter-aaaa/ns4/named2.conf.in      CONF-C  2012,2013,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns4/root.db     ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns4/sign.sh     SH      2010,2012,2014,2016,2018
 ./bin/tests/system/filter-aaaa/ns4/signed.db.in        ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns4/unsigned.db ZONE    2010,2012,2016,2017,2018
 ./bin/tests/system/filter-aaaa/ns5/hints       ZONE    2018
-./bin/tests/system/filter-aaaa/ns5/named.conf.in       CONF-C  2018
 ./bin/tests/system/filter-aaaa/setup.sh                SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/filter-aaaa/tests.sh                SH      2010,2012,2015,2016,2018
 ./bin/tests/system/formerr/clean.sh            SH      2013,2014,2015,2016,2018
 ./bin/tests/system/formerr/formerr.pl          PERL    2013,2014,2016,2018
 ./bin/tests/system/formerr/nametoolong         X       2013,2018
 ./bin/tests/system/formerr/noquestions         X       2013,2018
-./bin/tests/system/formerr/ns1/named.conf.in   CONF-C  2013,2016,2018
 ./bin/tests/system/formerr/ns1/root.db         ZONE    2013,2016,2018
 ./bin/tests/system/formerr/setup.sh            SH      2018
 ./bin/tests/system/formerr/tests.sh            SH      2013,2015,2016,2018
 ./bin/tests/system/formerr/twoquestions                X       2013,2018
 ./bin/tests/system/forward/clean.sh            SH      2000,2001,2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/forward/ns1/example.db      X       2000,2001,2018
-./bin/tests/system/forward/ns1/named.conf.in   CONF-C  2000,2001,2004,2007,2014,2016,2018
 ./bin/tests/system/forward/ns1/root.db         ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/forward/ns2/example.db      X       2000,2001,2018
-./bin/tests/system/forward/ns2/named.conf.in   CONF-C  2000,2001,2004,2007,2013,2014,2016,2018
 ./bin/tests/system/forward/ns2/root.db         ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/forward/ns3/named.conf.in   CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/forward/ns3/root.db         ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/forward/ns4/named.conf.in   CONF-C  2000,2001,2004,2007,2013,2014,2016,2018
 ./bin/tests/system/forward/ns4/root.db         ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/forward/ns5/named.conf.in   CONF-C  2011,2016,2018
 ./bin/tests/system/forward/ns5/root.db         ZONE    2011,2016,2018
-./bin/tests/system/forward/rfc1918-inherited.conf      CONF-C  2016,2018
-./bin/tests/system/forward/rfc1918-notinherited.conf   CONF-C  2016,2018
 ./bin/tests/system/forward/setup.sh            SH      2018
 ./bin/tests/system/forward/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2014,2016,2018
-./bin/tests/system/forward/ula-inherited.conf  CONF-C  2016,2018
-./bin/tests/system/forward/ula-notinherited.conf       CONF-C  2016,2018
 ./bin/tests/system/genzone.sh                  SH      2001,2002,2003,2004,2007,2009,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/geoip/clean.sh              SH      2013,2014,2016,2018
 ./bin/tests/system/geoip/data/GeoIP.csv                X       2013,2014,2018
 ./bin/tests/system/geoip/data/GeoIPv6.dat      X       2013,2018
 ./bin/tests/system/geoip/data/README           TXT.BRIEF       2013,2014,2016,2018
 ./bin/tests/system/geoip/ns2/example.db.in     ZONE    2013,2016,2018
-./bin/tests/system/geoip/ns2/named1.conf.in    CONF-C  2013,2014,2016,2018
-./bin/tests/system/geoip/ns2/named10.conf.in   CONF-C  2014,2016,2018
-./bin/tests/system/geoip/ns2/named11.conf.in   CONF-C  2013,2014,2016,2018
-./bin/tests/system/geoip/ns2/named12.conf.in   CONF-C  2013,2014,2016,2018
-./bin/tests/system/geoip/ns2/named13.conf.in   CONF-C  2014,2016,2018
-./bin/tests/system/geoip/ns2/named14.conf.in   CONF-C  2014,2016,2018
-./bin/tests/system/geoip/ns2/named15.conf.in   CONF-C  2014,2016,2018
-./bin/tests/system/geoip/ns2/named2.conf.in    CONF-C  2013,2016,2018
-./bin/tests/system/geoip/ns2/named3.conf.in    CONF-C  2013,2016,2018
-./bin/tests/system/geoip/ns2/named4.conf.in    CONF-C  2013,2016,2018
-./bin/tests/system/geoip/ns2/named5.conf.in    CONF-C  2013,2016,2018
-./bin/tests/system/geoip/ns2/named6.conf.in    CONF-C  2013,2014,2016,2018
-./bin/tests/system/geoip/ns2/named7.conf.in    CONF-C  2013,2016,2018
-./bin/tests/system/geoip/ns2/named8.conf.in    CONF-C  2013,2016,2018
-./bin/tests/system/geoip/ns2/named9.conf.in    CONF-C  2013,2016,2018
-./bin/tests/system/geoip/options.conf          CONF-C  2015,2016,2018
 ./bin/tests/system/geoip/prereq.sh             SH      2013,2014,2016,2018
 ./bin/tests/system/geoip/setup.sh              SH      2013,2014,2016,2018
 ./bin/tests/system/geoip/tests.sh              SH      2013,2014,2015,2016,2018
 ./bin/tests/system/glue/noglue.good            X       2000,2001,2018
 ./bin/tests/system/glue/ns1/cache.in           ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/glue/ns1/mil.db             ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/glue/ns1/named.conf.in      CONF-C  2000,2001,2004,2005,2007,2009,2016,2018
 ./bin/tests/system/glue/ns1/net.db             ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/glue/ns1/root-servers.nil.db        ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/glue/ns1/root.db            ZONE    2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/glue/xx.good                        X       2000,2001,2018
 ./bin/tests/system/glue/yy.good                        X       2000,2001,2003,2018
 ./bin/tests/system/idna/clean.sh               SH      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/setup.sh               SH      2018
 ./bin/tests/system/idna/tests.sh               SH      2018
 ./bin/tests/system/ifconfig.bat                        BAT     2016,2018
 ./bin/tests/system/ifconfig.sh                 SH      2000,2001,2002,2003,2004,2007,2008,2009,2010,2012,2013,2016,2018
 ./bin/tests/system/inline/clean.sh             SH      2011,2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/inline/ns1/named.conf.in    CONF-C  2011,2016,2018
 ./bin/tests/system/inline/ns1/root.db.in       ZONE    2011,2012,2013,2016,2017,2018
 ./bin/tests/system/inline/ns1/sign.sh          SH      2011,2012,2014,2016,2017,2018
 ./bin/tests/system/inline/ns2/bits.db.in       ZONE    2011,2016,2018
-./bin/tests/system/inline/ns2/named.conf.in    CONF-C  2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/inline/ns2/nsec3-loop.db    ZONE    2017,2018
 ./bin/tests/system/inline/ns3/master.db.in     ZONE    2011,2012,2016,2018
 ./bin/tests/system/inline/ns3/master2.db.in    ZONE    2011,2012,2016,2018
 ./bin/tests/system/inline/ns3/master3.db.in    ZONE    2012,2016,2018
 ./bin/tests/system/inline/ns3/master4.db.in    ZONE    2012,2016,2018
 ./bin/tests/system/inline/ns3/master5.db.in    ZONE    2018
-./bin/tests/system/inline/ns3/named.conf.in    CONF-C  2011,2012,2013,2015,2016,2017,2018
 ./bin/tests/system/inline/ns3/sign.sh          SH      2011,2012,2013,2014,2016,2017,2018
-./bin/tests/system/inline/ns4/named.conf.in    CONF-C  2011,2016,2018
 ./bin/tests/system/inline/ns4/noixfr.db.in     ZONE    2011,2016,2018
-./bin/tests/system/inline/ns5/named.conf.post  CONF-C  2011,2014,2016,2018
-./bin/tests/system/inline/ns5/named.conf.pre   CONF-C  2011,2016,2018
-./bin/tests/system/inline/ns6/named.conf.in    CONF-C  2011,2016,2018
-./bin/tests/system/inline/ns7/named.conf.in    CONF-C  2017,2018
+./bin/tests/system/inline/ns5/named.conf.post  X       2011,2014,2016,2018
+./bin/tests/system/inline/ns5/named.conf.pre   X       2011,2016,2018
 ./bin/tests/system/inline/ns7/sign.sh          SH      2017,2018
 ./bin/tests/system/inline/setup.sh             SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/inline/tests.sh             SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/integrity/clean.sh          SH      2017,2018
 ./bin/tests/system/integrity/ns1/mx-cname.db   ZONE    2017,2018
-./bin/tests/system/integrity/ns1/named.conf.in CONF-C  2017,2018
 ./bin/tests/system/integrity/ns1/srv-cname.db  ZONE    2017,2018
 ./bin/tests/system/integrity/setup.sh          SH      2018
 ./bin/tests/system/integrity/tests.sh          SH      2017,2018
 ./bin/tests/system/ixfr/ns3/mytest0.db         ZONE    2011,2016,2018
 ./bin/tests/system/ixfr/ns3/mytest1.db         ZONE    2011,2016,2018
 ./bin/tests/system/ixfr/ns3/mytest2.db         ZONE    2011,2016,2018
-./bin/tests/system/ixfr/ns3/named.conf.in      CONF-C  2011,2013,2014,2016,2018
 ./bin/tests/system/ixfr/ns3/subtest0.db                ZONE    2011,2016,2018
 ./bin/tests/system/ixfr/ns3/subtest1.db                ZONE    2011,2016,2018
-./bin/tests/system/ixfr/ns4/named.conf.in      CONF-C  2011,2013,2016,2018
 ./bin/tests/system/ixfr/prereq.sh              SH      2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/ixfr/setup.sh               SH      2001,2004,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/ixfr/tests.sh               SH      2001,2004,2007,2011,2012,2014,2016,2018
 ./bin/tests/system/keepalive/clean.sh          SH      2017,2018
 ./bin/tests/system/keepalive/expected          X       2017,2018
-./bin/tests/system/keepalive/ns1/named.conf.in CONF-C  2017,2018
 ./bin/tests/system/keepalive/ns1/root.db       ZONE    2017,2018
 ./bin/tests/system/keepalive/ns2/example.db    ZONE    2017,2018
-./bin/tests/system/keepalive/ns2/named.conf.in CONF-C  2017,2018
-./bin/tests/system/keepalive/ns3/named.conf.in CONF-C  2017,2018
 ./bin/tests/system/keepalive/setup.sh          SH      2017,2018
 ./bin/tests/system/keepalive/tests.sh          SH      2017,2018
 ./bin/tests/system/keymgr/01-ksk-inactive/README       TXT.BRIEF       2016,2018
 ./bin/tests/system/keymgr/17-noforce/expect    X       2016,2018
 ./bin/tests/system/keymgr/18-nonstd-prepub/README      TXT.BRIEF       2016,2018
 ./bin/tests/system/keymgr/18-nonstd-prepub/expect      X       2016,2018
-./bin/tests/system/keymgr/18-nonstd-prepub/policy.conf CONF-C  2016,2018
 ./bin/tests/system/keymgr/clean.sh             SH      2016,2018
-./bin/tests/system/keymgr/policy.conf          CONF-C  2016,2018
 ./bin/tests/system/keymgr/policy.good          X       2016,2018
-./bin/tests/system/keymgr/policy.sample                CONF-C  2016,2017,2018
+./bin/tests/system/keymgr/policy.sample                X       2016,2017,2018
 ./bin/tests/system/keymgr/setup.sh             SH      2016,2017,2018
 ./bin/tests/system/keymgr/testpolicy.py                PYTHON  2016,2018
 ./bin/tests/system/keymgr/tests.sh             SH      2016,2018
 ./bin/tests/system/legacy/build.sh             SH      2014,2016,2017,2018
 ./bin/tests/system/legacy/clean.sh             SH      2014,2016,2018
-./bin/tests/system/legacy/ns1/named1.conf.in   CONF-C  2014,2016,2018
-./bin/tests/system/legacy/ns1/named2.conf.in   CONF-C  2014,2016,2018
 ./bin/tests/system/legacy/ns1/root.db          ZONE    2014,2016,2018
 ./bin/tests/system/legacy/ns1/trusted.conf     X       2014,2018
 ./bin/tests/system/legacy/ns10/ednsrefused.db  ZONE    2018
-./bin/tests/system/legacy/ns10/named.conf.in   CONF-C  2018
 ./bin/tests/system/legacy/ns10/named.ednsrefused       X       2018
 ./bin/tests/system/legacy/ns2/dropedns.db      ZONE    2014,2016,2018
-./bin/tests/system/legacy/ns2/named.conf.in    CONF-C  2014,2016,2018
 ./bin/tests/system/legacy/ns2/named.dropedns   X       2014,2018
 ./bin/tests/system/legacy/ns3/dropedns-notcp.db        ZONE    2014,2016,2018
-./bin/tests/system/legacy/ns3/named.conf.in    CONF-C  2014,2016,2018
 ./bin/tests/system/legacy/ns3/named.dropedns   X       2014,2018
 ./bin/tests/system/legacy/ns3/named.notcp      X       2014,2018
 ./bin/tests/system/legacy/ns4/named.args       X       2014,2018
-./bin/tests/system/legacy/ns4/named.conf.in    CONF-C  2014,2016,2018
 ./bin/tests/system/legacy/ns4/plain.db         ZONE    2014,2016,2018
 ./bin/tests/system/legacy/ns5/named.args       X       2014,2018
-./bin/tests/system/legacy/ns5/named.conf.in    CONF-C  2014,2016,2018
 ./bin/tests/system/legacy/ns5/named.notcp      X       2014,2018
 ./bin/tests/system/legacy/ns5/plain-notcp.db   ZONE    2014,2016,2018
 ./bin/tests/system/legacy/ns6/edns512.db.in    ZONE    2014,2016,2018
 ./bin/tests/system/legacy/ns6/edns512.db.signed        X       2014,2018
 ./bin/tests/system/legacy/ns6/named.args       X       2014,2018
-./bin/tests/system/legacy/ns6/named.conf.in    CONF-C  2014,2016,2018
 ./bin/tests/system/legacy/ns6/sign.sh          SH      2014,2016,2018
 ./bin/tests/system/legacy/ns7/edns512-notcp.db.in      ZONE    2014,2016,2018
 ./bin/tests/system/legacy/ns7/edns512-notcp.db.signed  X       2014,2018
 ./bin/tests/system/legacy/ns7/named.args       X       2014,2018
-./bin/tests/system/legacy/ns7/named.conf.in    CONF-C  2014,2016,2018
 ./bin/tests/system/legacy/ns7/named.notcp      X       2014,2018
 ./bin/tests/system/legacy/ns7/sign.sh          SH      2014,2016,2018
 ./bin/tests/system/legacy/ns8/ednsformerr.db   ZONE    2018
-./bin/tests/system/legacy/ns8/named.conf.in    CONF-C  2018
 ./bin/tests/system/legacy/ns8/named.ednsformerr        X       2018
 ./bin/tests/system/legacy/ns9/ednsnotimp.db    ZONE    2018
-./bin/tests/system/legacy/ns9/named.conf.in    CONF-C  2018
 ./bin/tests/system/legacy/ns9/named.ednsnotimp X       2018
 ./bin/tests/system/legacy/setup.sh             SH      2014,2016,2018
 ./bin/tests/system/legacy/tests.sh             SH      2014,2015,2016,2018
 ./bin/tests/system/limits/knowngood.dig.out.4000       X       2000,2001,2018
 ./bin/tests/system/limits/knowngood.dig.out.a-maximum-rrset    X       2000,2001,2018
 ./bin/tests/system/limits/ns1/example.db       ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/limits/ns1/named.conf.in    CONF-C  2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/limits/ns1/root.db          ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/limits/setup.sh             SH      2018
 ./bin/tests/system/limits/tests.sh             SH      2000,2001,2004,2007,2011,2012,2016,2018
 ./bin/tests/system/logfileconfig/clean.sh      SH      2011,2012,2014,2015,2016,2017,2018
-./bin/tests/system/logfileconfig/ns1/controls.conf.in  CONF-C  2018
-./bin/tests/system/logfileconfig/ns1/named.dirconf     CONF-C  2011,2013,2016,2018
-./bin/tests/system/logfileconfig/ns1/named.iso8601     CONF-C  2016,2018
-./bin/tests/system/logfileconfig/ns1/named.iso8601-utc CONF-C  2016,2018
-./bin/tests/system/logfileconfig/ns1/named.pipeconf    CONF-C  2011,2013,2016,2018
-./bin/tests/system/logfileconfig/ns1/named.plain       CONF-C  2011,2013,2014,2016,2018
-./bin/tests/system/logfileconfig/ns1/named.plainconf   CONF-C  2014,2016,2018
-./bin/tests/system/logfileconfig/ns1/named.symconf     CONF-C  2011,2013,2016,2018
-./bin/tests/system/logfileconfig/ns1/named.tsconf      CONF-C  2017,2018
-./bin/tests/system/logfileconfig/ns1/named.unlimited   CONF-C  2016,2018
-./bin/tests/system/logfileconfig/ns1/named.versconf    CONF-C  2016,2018
-./bin/tests/system/logfileconfig/ns1/rndc.conf.in      CONF-C  2011,2013,2016,2017,2018
+./bin/tests/system/logfileconfig/ns1/named.dirconf     X       2011,2013,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.iso8601     X       2016,2018
+./bin/tests/system/logfileconfig/ns1/named.iso8601-utc X       2016,2018
+./bin/tests/system/logfileconfig/ns1/named.pipeconf    X       2011,2013,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.plain       X       2011,2013,2014,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.plainconf   X       2014,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.symconf     X       2011,2013,2016,2018
+./bin/tests/system/logfileconfig/ns1/named.tsconf      X       2017,2018
+./bin/tests/system/logfileconfig/ns1/named.unlimited   X       2016,2018
+./bin/tests/system/logfileconfig/ns1/named.versconf    X       2016,2018
 ./bin/tests/system/logfileconfig/ns1/root.db   ZONE    2011,2016,2018
 ./bin/tests/system/logfileconfig/setup.sh      SH      2011,2012,2014,2016,2018
 ./bin/tests/system/logfileconfig/tests.sh      SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/masterfile/clean.sh         SH      2001,2004,2007,2010,2012,2014,2015,2016,2018
 ./bin/tests/system/masterfile/knowngood.dig.out        X       2001,2004,2012,2018
 ./bin/tests/system/masterfile/ns1/include.db   ZONE    2001,2004,2007,2012,2016,2018
-./bin/tests/system/masterfile/ns1/named.conf.in        CONF-C  2001,2004,2007,2016,2018
 ./bin/tests/system/masterfile/ns1/sub.db       ZONE    2001,2004,2007,2016,2018
 ./bin/tests/system/masterfile/ns1/ttl1.db      ZONE    2001,2004,2007,2016,2018
 ./bin/tests/system/masterfile/ns1/ttl2.db      ZONE    2001,2004,2007,2016,2018
 ./bin/tests/system/masterfile/ns2/example.db   ZONE    2010,2016,2018
-./bin/tests/system/masterfile/ns2/named.conf.in        CONF-C  2010,2016,2018
 ./bin/tests/system/masterfile/setup.sh         SH      2018
 ./bin/tests/system/masterfile/tests.sh         SH      2001,2004,2007,2010,2012,2015,2016,2018
 ./bin/tests/system/masterfile/zone/inheritownerafterinclude.db ZONE    2015,2016,2018
 ./bin/tests/system/masterformat/ns1/compile.sh SH      2005,2006,2007,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/masterformat/ns1/example.db ZONE    2005,2007,2014,2016,2018
 ./bin/tests/system/masterformat/ns1/large.db.in        ZONE    2012,2016,2018
-./bin/tests/system/masterformat/ns1/named.conf.in      CONF-C  2005,2007,2011,2012,2013,2014,2016,2018
 ./bin/tests/system/masterformat/ns1/signed.db  ZONE    2013,2016,2018
 ./bin/tests/system/masterformat/ns2/formerly-text.db.in        ZONE    2011,2016,2018
-./bin/tests/system/masterformat/ns2/named.conf.in      CONF-C  2005,2007,2011,2012,2014,2016,2018
-./bin/tests/system/masterformat/ns3/named.conf.in      CONF-C  2012,2013,2016,2018
 ./bin/tests/system/masterformat/setup.sh       SH      2005,2006,2007,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/masterformat/tests.sh       SH      2005,2007,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/metadata/child.db           ZONE    2009,2016,2018
 ./bin/tests/system/metadata/tests.sh           SH      2009,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/mirror/README               TXT.BRIEF       2018
 ./bin/tests/system/mirror/clean.sh             SH      2018
-./bin/tests/system/mirror/ns1/named.conf.in    CONF-C  2018
 ./bin/tests/system/mirror/ns1/root.db.in       ZONE    2018
 ./bin/tests/system/mirror/ns1/sign.sh          SH      2018
 ./bin/tests/system/mirror/ns2/example.db.in    ZONE    2018
 ./bin/tests/system/mirror/ns2/initially-unavailable.db.in      ZONE    2018
-./bin/tests/system/mirror/ns2/named.conf.in    CONF-C  2018
 ./bin/tests/system/mirror/ns2/sign.sh          SH      2018
 ./bin/tests/system/mirror/ns2/sub.example.db.in        ZONE    2018
 ./bin/tests/system/mirror/ns2/verify.db.in     ZONE    2018
 ./bin/tests/system/mirror/ns3/named.args       X       2018
-./bin/tests/system/mirror/ns3/named.conf.in    CONF-C  2018
 ./bin/tests/system/mirror/setup.sh             SH      2018
 ./bin/tests/system/mirror/tests.sh             SH      2018
 ./bin/tests/system/mkeys/README                        TXT.BRIEF       2015,2016,2017,2018
 ./bin/tests/system/mkeys/clean.sh              SH      2015,2016,2017,2018
-./bin/tests/system/mkeys/ns1/named1.conf.in    CONF-C  2015,2016,2017,2018
-./bin/tests/system/mkeys/ns1/named2.conf.in    CONF-C  2015,2016,2017,2018
-./bin/tests/system/mkeys/ns1/named3.conf.in    CONF-C  2017,2018
 ./bin/tests/system/mkeys/ns1/root.db           ZONE    2015,2016,2017,2018
 ./bin/tests/system/mkeys/ns1/sign.sh           SH      2015,2016,2017,2018
 ./bin/tests/system/mkeys/ns2/named.args                X       2015,2016,2017,2018
-./bin/tests/system/mkeys/ns2/named.conf.in     CONF-C  2015,2016,2018
 ./bin/tests/system/mkeys/ns3/named.args                X       2015,2016,2017,2018
-./bin/tests/system/mkeys/ns3/named.conf.in     CONF-C  2015,2016,2017,2018
-./bin/tests/system/mkeys/ns4/named.conf.in     CONF-C  2017,2018
-./bin/tests/system/mkeys/ns5/named.conf.in     CONF-C  2017,2018
 ./bin/tests/system/mkeys/ns5/named1.args       X       2017,2018
 ./bin/tests/system/mkeys/ns5/named2.args       X       2017,2018
 ./bin/tests/system/mkeys/setup.sh              SH      2015,2016,2017,2018
 ./bin/tests/system/mkeys/tests.sh              SH      2015,2016,2017,2018
 ./bin/tests/system/names/clean.sh              SH      2015,2016,2018
 ./bin/tests/system/names/ns1/example.db                ZONE    2015,2016,2018
-./bin/tests/system/names/ns1/named.conf.in     CONF-C  2015,2016,2018
 ./bin/tests/system/names/setup.sh              SH      2015,2016,2018
 ./bin/tests/system/names/tests.sh              SH      2015,2016,2018
 ./bin/tests/system/notify/clean.sh             SH      2000,2001,2004,2007,2011,2012,2014,2015,2016,2018
-./bin/tests/system/notify/ns1/named.conf.in    CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/notify/ns1/root.db          ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/notify/ns2/example1.db      ZONE    2000,2001,2002,2004,2007,2009,2016,2018
 ./bin/tests/system/notify/ns2/example2.db      ZONE    2000,2001,2002,2004,2007,2009,2016,2018
 ./bin/tests/system/notify/ns2/example3.db      ZONE    2000,2001,2002,2004,2007,2009,2016,2018
 ./bin/tests/system/notify/ns2/example4.db      ZONE    2000,2001,2002,2004,2007,2009,2016,2018
 ./bin/tests/system/notify/ns2/generic.db       ZONE    2014,2016,2018
-./bin/tests/system/notify/ns2/named.conf.in    CONF-C  2000,2001,2004,2007,2011,2014,2016,2018
-./bin/tests/system/notify/ns3/named.conf.in    CONF-C  2000,2001,2004,2007,2016,2017,2018
-./bin/tests/system/notify/ns4/named.conf.in    CONF-C  2014,2016,2017,2018
 ./bin/tests/system/notify/ns4/named.port.in    X       2014,2018
-./bin/tests/system/notify/ns5/named.conf.in    CONF-C  2015,2016,2017,2018
 ./bin/tests/system/notify/ns5/x21.db           ZONE    2015,2016,2018
 ./bin/tests/system/notify/setup.sh             SH      2000,2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/notify/tests.sh             SH      2000,2001,2004,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/nslookup/clean.sh           SH      2014,2015,2016,2018
 ./bin/tests/system/nslookup/ns1/example.net.db ZONE    2016,2018
-./bin/tests/system/nslookup/ns1/named.conf.in  CONF-C  2014,2016,2018
 ./bin/tests/system/nslookup/setup.sh           SH      2014,2016,2018
 ./bin/tests/system/nslookup/tests.sh           SH      2014,2016,2018
 ./bin/tests/system/nsupdate/ans4/ans.pl                PERL    2017,2018
 ./bin/tests/system/nsupdate/ns1/many.test.db.in        ZONE    2014,2016,2017,2018
 ./bin/tests/system/nsupdate/ns1/max-ttl.db     ZONE    2014,2016,2018
 ./bin/tests/system/nsupdate/ns1/maxjournal.db.in       ZONE    2017,2018
-./bin/tests/system/nsupdate/ns1/named.conf.in  CONF-C  2000,2001,2004,2005,2007,2009,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/nsupdate/ns1/sample.db.in   ZONE    2016,2018
 ./bin/tests/system/nsupdate/ns10/dns.keytab    X       2018
 ./bin/tests/system/nsupdate/ns10/example.com.db.in     ZONE    2018
 ./bin/tests/system/nsupdate/ns10/in-addr.db.in ZONE    2018
 ./bin/tests/system/nsupdate/ns10/machine.ccache        X       2018
-./bin/tests/system/nsupdate/ns10/named.conf.in CONF-C  2018
-./bin/tests/system/nsupdate/ns2/named.conf.in  CONF-C  2000,2001,2004,2007,2011,2013,2016,2017,2018
 ./bin/tests/system/nsupdate/ns2/sample.db.in   ZONE    2016,2018
 ./bin/tests/system/nsupdate/ns3/delegation.test.db.in  ZONE    2016,2018
 ./bin/tests/system/nsupdate/ns3/dnskey.test.db.in      ZONE    2011,2016,2018
 ./bin/tests/system/nsupdate/ns3/example.db.in  ZONE    2010,2016,2018
-./bin/tests/system/nsupdate/ns3/named.conf.in  CONF-C  2010,2011,2013,2014,2016,2018
 ./bin/tests/system/nsupdate/ns3/nsec3param.test.db.in  ZONE    2010,2016,2018
 ./bin/tests/system/nsupdate/ns3/sign.sh                SH      2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/nsupdate/ns3/too-big.test.db.in     ZONE    2016,2018
 ./bin/tests/system/nsupdate/ns5/local.db.in    ZONE    2017,2018
 ./bin/tests/system/nsupdate/ns5/named.args     X       2017,2018
-./bin/tests/system/nsupdate/ns5/named.conf.in  CONF-C  2017,2018
 ./bin/tests/system/nsupdate/ns6/in-addr.db.in  ZONE    2018
 ./bin/tests/system/nsupdate/ns6/named.args     X       2018
-./bin/tests/system/nsupdate/ns6/named.conf.in  CONF-C  2018
 ./bin/tests/system/nsupdate/ns7/dns.keytab     X       2018
 ./bin/tests/system/nsupdate/ns7/example.com.db.in      ZONE    2018
 ./bin/tests/system/nsupdate/ns7/in-addr.db.in  ZONE    2018
 ./bin/tests/system/nsupdate/ns7/machine.ccache X       2018
-./bin/tests/system/nsupdate/ns7/named.conf.in  CONF-C  2018
 ./bin/tests/system/nsupdate/ns8/dns.keytab     X       2018
 ./bin/tests/system/nsupdate/ns8/example.com.db.in      ZONE    2018
 ./bin/tests/system/nsupdate/ns8/in-addr.db.in  ZONE    2018
 ./bin/tests/system/nsupdate/ns8/machine.ccache X       2018
-./bin/tests/system/nsupdate/ns8/named.conf.in  CONF-C  2018
 ./bin/tests/system/nsupdate/ns9/dns.keytab     X       2018
 ./bin/tests/system/nsupdate/ns9/example.com.db.in      ZONE    2018
 ./bin/tests/system/nsupdate/ns9/in-addr.db.in  ZONE    2018
 ./bin/tests/system/nsupdate/ns9/machine.ccache X       2018
-./bin/tests/system/nsupdate/ns9/named.conf.in  CONF-C  2018
 ./bin/tests/system/nsupdate/prereq.sh          SH      2014,2015,2016,2018
 ./bin/tests/system/nsupdate/setup.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/nsupdate/tests.sh           SH      2000,2001,2004,2007,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/nsupdate/verylarge.in       X       2013,2018
 ./bin/tests/system/nzd2nzf/clean.sh            SH      2016,2018
 ./bin/tests/system/nzd2nzf/ns1/added.db                ZONE    2016,2018
-./bin/tests/system/nzd2nzf/ns1/named.conf.in   CONF-C  2016,2018
 ./bin/tests/system/nzd2nzf/prereq.sh           SH      2016,2018
 ./bin/tests/system/nzd2nzf/setup.sh            SH      2016,2018
 ./bin/tests/system/nzd2nzf/tests.sh            SH      2016,2018
 ./bin/tests/system/org.isc.bind.system.plist   X       2010,2018
 ./bin/tests/system/packet.pl                   PERL    2011,2012,2016,2018
 ./bin/tests/system/padding/clean.sh            SH      2017,2018
-./bin/tests/system/padding/ns1/named.conf.in   CONF-C  2017,2018
 ./bin/tests/system/padding/ns1/root.db         ZONE    2017,2018
 ./bin/tests/system/padding/ns2/example.db      ZONE    2017,2018
-./bin/tests/system/padding/ns2/named.conf.in   CONF-C  2017,2018
-./bin/tests/system/padding/ns3/named.conf.in   CONF-C  2017,2018
-./bin/tests/system/padding/ns4/named.conf.in   CONF-C  2017,2018
 ./bin/tests/system/padding/setup.sh            SH      2017,2018
 ./bin/tests/system/padding/tests.sh            SH      2017,2018
 ./bin/tests/system/pending/clean.sh            SH      2009,2012,2014,2016,2018
-./bin/tests/system/pending/ns1/named.conf.in   CONF-C  2009,2016,2018
 ./bin/tests/system/pending/ns1/root.db.in      ZONE    2009,2010,2016,2018
 ./bin/tests/system/pending/ns1/sign.sh         SH      2009,2010,2012,2014,2016,2018
 ./bin/tests/system/pending/ns2/example.com.db.in       ZONE    2009,2010,2016,2018
 ./bin/tests/system/pending/ns2/example.db.in   ZONE    2009,2010,2016,2018
 ./bin/tests/system/pending/ns2/forgery.db      ZONE    2010,2016,2018
-./bin/tests/system/pending/ns2/named.conf.in   CONF-C  2009,2010,2016,2018
 ./bin/tests/system/pending/ns2/sign.sh         SH      2009,2010,2012,2014,2016,2017,2018
 ./bin/tests/system/pending/ns3/hostile.db      ZONE    2009,2016,2018
 ./bin/tests/system/pending/ns3/mail.example.db ZONE    2009,2016,2018
-./bin/tests/system/pending/ns3/named.conf.in   CONF-C  2009,2016,2018
-./bin/tests/system/pending/ns4/named.conf.in   CONF-C  2009,2016,2018
 ./bin/tests/system/pending/setup.sh            SH      2009,2012,2014,2016,2017,2018
 ./bin/tests/system/pending/tests.sh            SH      2009,2010,2012,2015,2016,2018
 ./bin/tests/system/pipelined/clean.sh          SH      2014,2015,2016,2018
 ./bin/tests/system/pipelined/input             X       2014,2015,2018
 ./bin/tests/system/pipelined/inputb            X       2014,2015,2018
-./bin/tests/system/pipelined/ns1/named.conf.in CONF-C  2014,2015,2016,2018
 ./bin/tests/system/pipelined/ns1/root.db       ZONE    2014,2015,2016,2018
 ./bin/tests/system/pipelined/ns2/examplea.db   ZONE    2014,2015,2016,2018
-./bin/tests/system/pipelined/ns2/named.conf.in CONF-C  2014,2015,2016,2018
 ./bin/tests/system/pipelined/ns3/exampleb.db   ZONE    2014,2015,2016,2018
 ./bin/tests/system/pipelined/ns3/named.args    X       2014,2015,2018
-./bin/tests/system/pipelined/ns3/named.conf.in CONF-C  2014,2015,2016,2018
-./bin/tests/system/pipelined/ns4/named.conf.in CONF-C  2014,2015,2016,2018
 ./bin/tests/system/pipelined/pipequeries.c     C       2014,2015,2015,2016,2017,2018
 ./bin/tests/system/pipelined/ref               X       2014,2015,2018
 ./bin/tests/system/pipelined/refb              X       2014,2015,2018
 ./bin/tests/system/pipelined/tests.sh          SH      2014,2015,2016,2017,2018
 ./bin/tests/system/pkcs11/clean.sh             SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/pkcs11/ns1/example.db.in    ZONE    2010,2016,2018
-./bin/tests/system/pkcs11/ns1/named.conf       CONF-C  2010,2013,2014,2016,2017,2018
 ./bin/tests/system/pkcs11/prereq.sh            SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/pkcs11/setup.sh             SH      2010,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/pkcs11/tests.sh             SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/qmin/ans3/ans.py            PYTHON  2018
 ./bin/tests/system/qmin/ans4/ans.py            PYTHON  2018
 ./bin/tests/system/qmin/clean.sh               SH      2018
-./bin/tests/system/qmin/ns1/named.conf.in      CONF-C  2018
 ./bin/tests/system/qmin/ns1/root.db            ZONE    2018
-./bin/tests/system/qmin/ns5/named.conf.in      CONF-C  2018
-./bin/tests/system/qmin/ns6/named.conf.in      CONF-C  2018
-./bin/tests/system/qmin/ns7/named.conf.in      CONF-C  2018
 ./bin/tests/system/qmin/prereq.sh              SH      2018
 ./bin/tests/system/qmin/setup.sh               SH      2018
 ./bin/tests/system/qmin/tests.sh               SH      2018
 ./bin/tests/system/reclimit/ans4/ans.pl                PERL    2018
 ./bin/tests/system/reclimit/ans7/ans.pl                PERL    2014,2016,2018
 ./bin/tests/system/reclimit/clean.sh           SH      2014,2016,2018
-./bin/tests/system/reclimit/ns1/named.conf.in  CONF-C  2014,2016,2018
 ./bin/tests/system/reclimit/ns1/root.db                ZONE    2014,2016,2017,2018
 ./bin/tests/system/reclimit/ns3/hints.db       ZONE    2014,2016,2018
-./bin/tests/system/reclimit/ns3/named1.conf.in CONF-C  2014,2016,2018
-./bin/tests/system/reclimit/ns3/named2.conf.in CONF-C  2014,2016,2018
-./bin/tests/system/reclimit/ns3/named3.conf.in CONF-C  2014,2016,2018
-./bin/tests/system/reclimit/ns3/named4.conf.in CONF-C  2014,2016,2018
 ./bin/tests/system/reclimit/prereq.sh          SH      2015,2016,2017,2018
 ./bin/tests/system/reclimit/setup.sh           SH      2014,2016,2018
 ./bin/tests/system/reclimit/tests.sh           SH      2014,2015,2016,2017,2018
 ./bin/tests/system/redirect/clean.sh           SH      2011,2012,2013,2014,2015,2016,2018
-./bin/tests/system/redirect/conf/bad1.conf     CONF-C  2011,2016,2018
-./bin/tests/system/redirect/conf/bad2.conf     CONF-C  2011,2016,2018
-./bin/tests/system/redirect/conf/bad3.conf     CONF-C  2011,2016,2018
-./bin/tests/system/redirect/conf/good1.conf    CONF-C  2011,2016,2018
-./bin/tests/system/redirect/conf/good2.conf    CONF-C  2011,2016,2018
-./bin/tests/system/redirect/conf/good3.conf    CONF-C  2011,2016,2018
-./bin/tests/system/redirect/conf/good4.conf    CONF-C  2011,2016,2018
 ./bin/tests/system/redirect/ns1/example.db     ZONE    2011,2016,2018
-./bin/tests/system/redirect/ns1/named.conf.in  CONF-C  2011,2016,2018
 ./bin/tests/system/redirect/ns1/redirect.db    ZONE    2011,2016,2018
 ./bin/tests/system/redirect/ns1/root.db                ZONE    2011,2016,2018
 ./bin/tests/system/redirect/ns1/sign.sh                SH      2011,2012,2014,2016,2017,2018
 ./bin/tests/system/redirect/ns2/example.db.in  ZONE    2013,2016,2018
-./bin/tests/system/redirect/ns2/named.conf.in  CONF-C  2011,2013,2016,2018
 ./bin/tests/system/redirect/ns2/redirect.db.in ZONE    2011.2013,2013,2016,2018
 ./bin/tests/system/redirect/ns3/example.db     ZONE    2015,2016,2018
-./bin/tests/system/redirect/ns3/named.conf.in  CONF-C  2015,2016,2018
 ./bin/tests/system/redirect/ns3/redirect.db    ZONE    2015,2016,2018
 ./bin/tests/system/redirect/ns3/root.db                ZONE    2015,2016,2018
 ./bin/tests/system/redirect/ns3/sign.sh                SH      2015,2016,2017,2018
 ./bin/tests/system/redirect/ns4/example.db.in  ZONE    2015,2016,2018
-./bin/tests/system/redirect/ns4/named.conf.in  CONF-C  2015,2016,2018
 ./bin/tests/system/redirect/ns4/root.hint      ZONE    2015,2016,2018
 ./bin/tests/system/redirect/setup.sh           SH      2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/redirect/tests.sh           SH      2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/resolver/ans3/ans.pl                PERL    2000,2001,2004,2007,2009,2012,2016,2018
 ./bin/tests/system/resolver/ans8/ans.pl                PERL    2017,2018
 ./bin/tests/system/resolver/clean.sh           SH      2008,2009,2010,2011,2012,2013,2014,2015,2016,2018
-./bin/tests/system/resolver/ns1/named.conf.in  CONF-C  2000,2001,2004,2007,2009,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/resolver/ns1/root.hint      ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/resolver/ns4/broken.db      ZONE    2012,2016,2018
 ./bin/tests/system/resolver/ns4/child.server.db        ZONE    2011,2016,2018
 ./bin/tests/system/resolver/ns4/moves.db       ZONE    2011,2016,2018
-./bin/tests/system/resolver/ns4/named.conf.in  CONF-C  2010,2011,2012,2013,2015,2016,2018
 ./bin/tests/system/resolver/ns4/named.noaa     TXT.BRIEF       2010,2016,2018
 ./bin/tests/system/resolver/ns4/root.db                ZONE    2010,2014,2015,2016,2017,2018
 ./bin/tests/system/resolver/ns4/tld1.db                ZONE    2012,2014,2016,2017,2018
 ./bin/tests/system/resolver/ns4/tld2.db                ZONE    2012,2014,2016,2017,2018
 ./bin/tests/system/resolver/ns5/child.server.db        ZONE    2011,2016,2018
 ./bin/tests/system/resolver/ns5/moves.db       ZONE    2011,2016,2018
-./bin/tests/system/resolver/ns5/named.conf.in  CONF-C  2010,2011,2013,2014,2015,2016,2018
 ./bin/tests/system/resolver/ns5/root.hint      ZONE    2010,2016,2018
 ./bin/tests/system/resolver/ns6/broken.db      ZONE    2012,2016,2018
 ./bin/tests/system/resolver/ns6/delegation-only.db     ZONE    2015,2016,2018
 ./bin/tests/system/resolver/ns6/fetch.tld.db   ZONE    2017,2018
 ./bin/tests/system/resolver/ns6/keygen.sh      SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/resolver/ns6/moves.db       ZONE    2011,2016,2018
-./bin/tests/system/resolver/ns6/named.conf.in  CONF-C  2010,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/resolver/ns6/no-edns-version.tld.db ZONE    2014,2016,2018
 ./bin/tests/system/resolver/ns6/root.db                ZONE    2010,2011,2014,2016,2018
 ./bin/tests/system/resolver/ns6/to-be-removed.tld.db.in        ZONE    2012,2016,2018
 ./bin/tests/system/resolver/ns7/all-cnames.db  ZONE    2014,2016,2018
 ./bin/tests/system/resolver/ns7/edns-version.tld.db    ZONE    2014,2016,2018
 ./bin/tests/system/resolver/ns7/named.args     X       2011,2012,2014,2018
-./bin/tests/system/resolver/ns7/named1.conf.in CONF-C  2010,2011,2013,2014,2016,2018
-./bin/tests/system/resolver/ns7/named2.conf.in CONF-C  2013,2014,2016,2018
 ./bin/tests/system/resolver/ns7/root.hint      ZONE    2010,2016,2018
 ./bin/tests/system/resolver/ns7/server.db.in   ZONE    2011,2016,2018
 ./bin/tests/system/resolver/prereq.sh          SH      2000,2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/rndc/clean.sh               SH      2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rndc/gencheck.c             C       2014,2015,2016,2018
 ./bin/tests/system/rndc/ns2/incl.db            ZONE    2013,2016,2018
-./bin/tests/system/rndc/ns2/named.conf.in      CONF-C  2011,2012,2013,2016,2018
-./bin/tests/system/rndc/ns2/secondkey.conf     CONF-C  2012,2013,2016,2018
-./bin/tests/system/rndc/ns3/named.conf.in      CONF-C  2012,2013,2015,2016,2018
-./bin/tests/system/rndc/ns4/named.conf.in      CONF-C  2013,2014,2015,2016,2018
-./bin/tests/system/rndc/ns5/named.conf.in      CONF-C  2015,2016,2018
 ./bin/tests/system/rndc/ns6/named.args         X       2016,2018
-./bin/tests/system/rndc/ns6/named.conf.in      CONF-C  2016,2018
 ./bin/tests/system/rndc/setup.sh               SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rndc/tests.sh               SH      2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rootkeysentinel/clean.sh    SH      2018
-./bin/tests/system/rootkeysentinel/ns1/named.conf.in   CONF-C  2018
 ./bin/tests/system/rootkeysentinel/ns1/root.db.in      ZONE    2018
 ./bin/tests/system/rootkeysentinel/ns1/sign.sh SH      2018
 ./bin/tests/system/rootkeysentinel/ns2/example.db.in   ZONE    2018
-./bin/tests/system/rootkeysentinel/ns2/named.conf.in   CONF-C  2018
 ./bin/tests/system/rootkeysentinel/ns2/sign.sh SH      2018
 ./bin/tests/system/rootkeysentinel/ns3/hint.db ZONE    2018
-./bin/tests/system/rootkeysentinel/ns3/named.conf.in   CONF-C  2018
 ./bin/tests/system/rootkeysentinel/ns4/hint.db ZONE    2018
-./bin/tests/system/rootkeysentinel/ns4/named.conf.in   CONF-C  2018
 ./bin/tests/system/rootkeysentinel/setup.sh    SH      2018
 ./bin/tests/system/rootkeysentinel/tests.sh    SH      2018
 ./bin/tests/system/rpz/ckdnsrps.sh             SH      2017,2018
 ./bin/tests/system/rpz/clean.sh                        SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/dnsrps.c                        C       2017,2018
 ./bin/tests/system/rpz/dnsrpzd-license.conf    X       2017,2018
-./bin/tests/system/rpz/dnsrpzd.conf.in         CONF-C  2017,2018
-./bin/tests/system/rpz/ns1/named.conf.in       CONF-C  2011,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns1/root.db             ZONE    2011,2012,2013,2016,2018
 ./bin/tests/system/rpz/ns2/base-tld2s.db       ZONE    2012,2013,2016,2018
 ./bin/tests/system/rpz/ns2/bl.tld2.db.in       ZONE    2013,2016,2018
 ./bin/tests/system/rpz/ns2/blv2.tld2.db.in     ZONE    2013,2016,2018
 ./bin/tests/system/rpz/ns2/blv3.tld2.db.in     ZONE    2013,2016,2018
 ./bin/tests/system/rpz/ns2/hints               ZONE    2011,2013,2016,2018
-./bin/tests/system/rpz/ns2/named.conf.in       CONF-C  2011,2012,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns2/tld2.db             ZONE    2011,2012,2013,2016,2018
 ./bin/tests/system/rpz/ns3/base.db             ZONE    2011,2012,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns3/crash1              X       2011,2013,2018
 ./bin/tests/system/rpz/ns3/crash2              X       2011,2012,2013,2018
 ./bin/tests/system/rpz/ns3/hints               ZONE    2011,2013,2016,2018
-./bin/tests/system/rpz/ns3/named.conf.in       CONF-C  2011,2012,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns4/hints               ZONE    2011,2013,2016,2018
-./bin/tests/system/rpz/ns4/named.conf.in       CONF-C  2011,2012,2013,2016,2017,2018
 ./bin/tests/system/rpz/ns4/tld4.db             ZONE    2011,2012,2013,2016,2018
 ./bin/tests/system/rpz/ns5/empty.db.in         ZONE    2014,2016,2018
 ./bin/tests/system/rpz/ns5/hints               ZONE    2011,2012,2013,2016,2018
 ./bin/tests/system/rpz/ns5/named.args          X       2013,2014,2018
-./bin/tests/system/rpz/ns5/named.conf.in       CONF-C  2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/ns5/tld5.db             ZONE    2013,2016,2017,2018
 ./bin/tests/system/rpz/ns6/hints               ZONE    2014,2016,2018
-./bin/tests/system/rpz/ns6/named.conf.in       CONF-C  2014,2016,2017,2018
 ./bin/tests/system/rpz/ns7/hints               ZONE    2014,2016,2018
-./bin/tests/system/rpz/ns7/named.conf.in       CONF-C  2014,2016,2017,2018
 ./bin/tests/system/rpz/qperf.sh                        SH      2012,2013,2016,2018
 ./bin/tests/system/rpz/setup.sh                        SH      2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/rpz/test1                   ZONE    2011,2012,2013,2016,2018
 ./bin/tests/system/rpzrecurse/ns1/db.l0                ZONE    2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns1/db.l1.l0     ZONE    2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns1/example.db   ZONE    2015,2016,2018
-./bin/tests/system/rpzrecurse/ns1/named.conf.in        CONF-C  2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns1/root.db      ZONE    2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns1/test1.example.net.db ZONE    2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns1/test2.example.net.db ZONE    2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns2/db.wildcard2a        ZONE    2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns2/db.wildcard2b        ZONE    2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns2/db.wildcard3 ZONE    2015,2016,2018
-./bin/tests/system/rpzrecurse/ns2/named.clientip.conf  CONF-C  2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/ns2/named.clientip2.conf CONF-C  2016,2017,2018
-./bin/tests/system/rpzrecurse/ns2/named.conf.header.in CONF-C  2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/ns2/named.default.conf   CONF-C  2015,2016,2018
-./bin/tests/system/rpzrecurse/ns2/named.invalidprefixlength.conf       CONF-C  2018
-./bin/tests/system/rpzrecurse/ns2/named.log.conf       CONF-C  2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/ns2/named.max.conf       CONF-C  2018
-./bin/tests/system/rpzrecurse/ns2/named.wildcard1.conf CONF-C  2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/ns2/named.wildcard2.conf CONF-C  2015,2016,2017,2018
-./bin/tests/system/rpzrecurse/ns2/named.wildcard3.conf CONF-C  2015,2016,2017,2018
+./bin/tests/system/rpzrecurse/ns2/named.conf.header.in X       2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns2/root.hint    ZONE    2015,2016,2018
 ./bin/tests/system/rpzrecurse/ns3/example.db   ZONE    2016,2018
-./bin/tests/system/rpzrecurse/ns3/named1.conf.in       CONF-C  2016,2017,2018
-./bin/tests/system/rpzrecurse/ns3/named2.conf.in       CONF-C  2016,2017,2018
 ./bin/tests/system/rpzrecurse/ns3/policy.db    ZONE    2016,2018
 ./bin/tests/system/rpzrecurse/ns3/root.db      ZONE    2016,2018
 ./bin/tests/system/rpzrecurse/ns4/child.example.db     ZONE    2016,2018
-./bin/tests/system/rpzrecurse/ns4/named.conf.in        CONF-C  2016,2017,2018
 ./bin/tests/system/rpzrecurse/prereq.sh                SH      2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/setup.sh         SH      2015,2016,2017,2018
 ./bin/tests/system/rpzrecurse/testgen.pl       PERL    2015,2016,2017,2018
 ./bin/tests/system/rrchecker/privatelist.good  X       2013,2018
 ./bin/tests/system/rrchecker/tests.sh          SH      2013,2014,2015,2016,2017,2018
 ./bin/tests/system/rrchecker/typelist.good     X       2013,2014,2015,2016,2017,2018
-./bin/tests/system/rrl/broken.conf             CONF-C  2016,2017,2018
 ./bin/tests/system/rrl/clean.sh                        SH      2012,2013,2014,2016,2018
-./bin/tests/system/rrl/ns1/named.conf.in       CONF-C  2012,2013,2016,2018
 ./bin/tests/system/rrl/ns1/root.db             ZONE    2012,2013,2016,2018
 ./bin/tests/system/rrl/ns2/hints               ZONE    2012,2013,2016,2018
-./bin/tests/system/rrl/ns2/named.conf.in       CONF-C  2012,2013,2016,2017,2018
 ./bin/tests/system/rrl/ns2/tld2.db             ZONE    2012,2013,2016,2018
 ./bin/tests/system/rrl/ns3/hints               ZONE    2012,2013,2016,2018
-./bin/tests/system/rrl/ns3/named.conf.in       CONF-C  2012,2013,2016,2018
 ./bin/tests/system/rrl/ns3/tld3.db             ZONE    2012,2013,2016,2018
 ./bin/tests/system/rrl/ns4/hints               ZONE    2016,2018
-./bin/tests/system/rrl/ns4/named.conf.in       CONF-C  2016,2017,2018
 ./bin/tests/system/rrl/ns4/tld4.db             ZONE    2016,2018
 ./bin/tests/system/rrl/setup.sh                        SH      2012,2013,2016,2018
 ./bin/tests/system/rrl/tests.sh                        SH      2012,2013,2015,2016,2018
 ./bin/tests/system/rrsetorder/dig.out.random.good7     X       2006,2018
 ./bin/tests/system/rrsetorder/dig.out.random.good8     X       2006,2018
 ./bin/tests/system/rrsetorder/dig.out.random.good9     X       2006,2018
-./bin/tests/system/rrsetorder/ns1/named.conf.in        CONF-C  2006,2007,2013,2016,2018
 ./bin/tests/system/rrsetorder/ns1/root.db      ZONE    2006,2007,2012,2016,2017,2018
-./bin/tests/system/rrsetorder/ns2/named.conf.in        CONF-C  2006,2007,2016,2018
-./bin/tests/system/rrsetorder/ns3/named.conf.in        CONF-C  2006,2007,2016,2017,2018
-./bin/tests/system/rrsetorder/ns4/named.conf.in        CONF-C  2015,2016,2017,2018
-./bin/tests/system/rrsetorder/ns5/named.conf.in        CONF-C  2018
 ./bin/tests/system/rrsetorder/setup.sh         SH      2018
 ./bin/tests/system/rrsetorder/tests.sh         SH      2006,2007,2008,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/rsabigexponent/bigkey.c     C       2012,2014,2015,2016,2017,2018
 ./bin/tests/system/rsabigexponent/clean.sh     SH      2012,2014,2016,2018
-./bin/tests/system/rsabigexponent/conf/bad01.conf      CONF-C  2012,2016,2018
-./bin/tests/system/rsabigexponent/conf/bad02.conf      CONF-C  2012,2016,2018
-./bin/tests/system/rsabigexponent/conf/bad03.conf      CONF-C  2012,2016,2018
-./bin/tests/system/rsabigexponent/conf/good01.conf     CONF-C  2012,2016,2018
-./bin/tests/system/rsabigexponent/conf/good02.conf     CONF-C  2012,2016,2018
-./bin/tests/system/rsabigexponent/conf/good03.conf     CONF-C  2012,2016,2018
-./bin/tests/system/rsabigexponent/ns1/named.conf.in    CONF-C  2012,2016,2018
 ./bin/tests/system/rsabigexponent/ns1/root.db.in       ZONE    2012,2016,2018
 ./bin/tests/system/rsabigexponent/ns1/sign.sh  SH      2012,2014,2016,2018
 ./bin/tests/system/rsabigexponent/ns2/Xexample.+005+05896.key  X       2012,2018
 ./bin/tests/system/rsabigexponent/ns2/dsset-example.in X       2012,2018
 ./bin/tests/system/rsabigexponent/ns2/example.db.bad   ZONE    2012,2016,2018
 ./bin/tests/system/rsabigexponent/ns2/example.db.in    ZONE    2012,2016,2018
-./bin/tests/system/rsabigexponent/ns2/named.conf.in    CONF-C  2012,2016,2018
 ./bin/tests/system/rsabigexponent/ns2/sign.sh  SH      2012,2014,2016,2018
-./bin/tests/system/rsabigexponent/ns3/named.conf.in    CONF-C  2012,2016,2018
 ./bin/tests/system/rsabigexponent/prereq.sh    SH      2012,2014,2016,2017,2018
 ./bin/tests/system/rsabigexponent/setup.sh     SH      2012,2014,2016,2017,2018
 ./bin/tests/system/rsabigexponent/tests.sh     SH      2012,2016,2018
 ./bin/tests/system/runsequential.sh            SH      2018
 ./bin/tests/system/runtime/README              TXT.BRIEF       2014,2016,2018
 ./bin/tests/system/runtime/clean.sh            SH      2014,2015,2016,2017,2018
-./bin/tests/system/runtime/ns2/named-alt1.conf.in      CONF-C  2014,2016,2018
-./bin/tests/system/runtime/ns2/named-alt2.conf.in      CONF-C  2014,2016,2017,2018
-./bin/tests/system/runtime/ns2/named-alt3.conf.in      CONF-C  2015,2016,2017,2018
-./bin/tests/system/runtime/ns2/named-alt4.conf.in      CONF-C  2017,2018
-./bin/tests/system/runtime/ns2/named-alt5.conf.in      CONF-C  2017,2018
-./bin/tests/system/runtime/ns2/named-alt6.conf.in      CONF-C  2017,2018
-./bin/tests/system/runtime/ns2/named1.conf.in  CONF-C  2017,2018
 ./bin/tests/system/runtime/setup.sh            SH      2015,2016,2017,2018
 ./bin/tests/system/runtime/tests.sh            SH      2014,2015,2016,2017,2018
 ./bin/tests/system/send.pl                     PERL    2001,2004,2007,2011,2012,2016,2018
 ./bin/tests/system/serve-stale/ans2/ans.pl     PERL    2017,2018
 ./bin/tests/system/serve-stale/clean.sh                SH      2017,2018
-./bin/tests/system/serve-stale/ns1/named1.conf.in      CONF-C  2017,2018
-./bin/tests/system/serve-stale/ns1/named2.conf.in      CONF-C  2017,2018
 ./bin/tests/system/serve-stale/ns1/root.db     ZONE    2017,2018
-./bin/tests/system/serve-stale/ns3/named.conf.in       CONF-C  2017,2018
 ./bin/tests/system/serve-stale/prereq.sh       SH      2017,2018
 ./bin/tests/system/serve-stale/setup.sh                SH      2017,2018
 ./bin/tests/system/serve-stale/tests.sh                SH      2017,2018
 ./bin/tests/system/setup.sh                    SH      2000,2001,2004,2007,2012,2014,2016,2018
 ./bin/tests/system/sfcache/README              TXT.BRIEF       2014,2016,2018
 ./bin/tests/system/sfcache/clean.sh            SH      2014,2015,2016,2017,2018
-./bin/tests/system/sfcache/ns1/named.conf.in   CONF-C  2014,2016,2018
 ./bin/tests/system/sfcache/ns1/root.db.in      ZONE    2014,2016,2018
 ./bin/tests/system/sfcache/ns1/sign.sh         SH      2014,2016,2017,2018
 ./bin/tests/system/sfcache/ns2/example.db.in   ZONE    2014,2016,2018
-./bin/tests/system/sfcache/ns2/named.conf.in   CONF-C  2014,2016,2018
 ./bin/tests/system/sfcache/ns2/sign.sh         SH      2014,2016,2018
-./bin/tests/system/sfcache/ns5/named.conf.in   CONF-C  2014,2016,2017,2018
-./bin/tests/system/sfcache/ns5/trusted.conf.bad        CONF-C  2014,2016,2018
+./bin/tests/system/sfcache/ns5/trusted.conf.bad        X       2014,2016,2018
 ./bin/tests/system/sfcache/prereq.sh           SH      2014,2016,2017,2018
 ./bin/tests/system/sfcache/setup.sh            SH      2014,2016,2017,2018
 ./bin/tests/system/sfcache/tests.sh            SH      2014,2016,2017,2018
 ./bin/tests/system/smartsign/tests.sh          SH      2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/sortlist/clean.sh           SH      2000,2001,2004,2007,2009,2012,2014,2015,2016,2018
 ./bin/tests/system/sortlist/ns1/example.db     ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/sortlist/ns1/named.conf.in  CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/sortlist/ns1/root.db                ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/sortlist/setup.sh           SH      2018
 ./bin/tests/system/sortlist/tests.sh           SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/spf/clean.sh                        SH      2013,2014,2016,2018
-./bin/tests/system/spf/ns1/named.conf.in       CONF-C  2013,2016,2018
 ./bin/tests/system/spf/ns1/spf.db              ZONE    2013,2016,2018
 ./bin/tests/system/spf/setup.sh                        SH      2018
 ./bin/tests/system/spf/tests.sh                        SH      2013,2014,2016,2018
 ./bin/tests/system/start.pl                    SH      2001,2004,2005,2006,2007,2008,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/start.sh                    SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/staticstub/clean.sh         SH      2010,2012,2014,2015,2016,2018
-./bin/tests/system/staticstub/conf/bad01.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad02.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad03.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad04.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad05.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad06.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad07.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad08.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad09.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad10.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/bad11.conf  CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/good01.conf CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/good02.conf CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/good03.conf CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/good04.conf CONF-C  2010,2016,2018
-./bin/tests/system/staticstub/conf/good05.conf CONF-C  2010,2016,2018
 ./bin/tests/system/staticstub/knowngood.dig.out.rec    X       2010,2013,2018
-./bin/tests/system/staticstub/ns1/named.conf.in        CONF-C  2010,2016,2018
 ./bin/tests/system/staticstub/ns1/root.db      ZONE    2010,2016,2018
-./bin/tests/system/staticstub/ns2/named.conf.in        CONF-C  2010,2015,2016,2018
 ./bin/tests/system/staticstub/ns3/example.db.in        ZONE    2010,2016,2018
 ./bin/tests/system/staticstub/ns3/example.org.db       ZONE    2010,2016,2018
-./bin/tests/system/staticstub/ns3/named.conf.in        CONF-C  2010,2013,2015,2016,2018
 ./bin/tests/system/staticstub/ns3/sign.sh      SH      2010,2012,2014,2015,2016,2018
 ./bin/tests/system/staticstub/ns3/undelegated.db.in    ZONE    2015,2016,2018
 ./bin/tests/system/staticstub/ns4/example.com.db       ZONE    2010,2016,2018
 ./bin/tests/system/staticstub/ns4/example.info.db      ZONE    2010,2016,2018
 ./bin/tests/system/staticstub/ns4/example.org.db       ZONE    2010,2016,2018
-./bin/tests/system/staticstub/ns4/named.conf.in        CONF-C  2010,2016,2018
 ./bin/tests/system/staticstub/ns4/sign.sh      SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/staticstub/ns4/sub.example.db.in    ZONE    2010,2016,2018
 ./bin/tests/system/staticstub/setup.sh         SH      2010,2012,2014,2016,2017,2018
 ./bin/tests/system/staticstub/tests.sh         SH      2010,2011,2012,2013,2015,2016,2018
 ./bin/tests/system/statistics/ans4/ans.pl      PERL    2012,2016,2018
 ./bin/tests/system/statistics/clean.sh         SH      2012,2014,2015,2016,2018
-./bin/tests/system/statistics/ns1/named.conf.in        CONF-C  2012,2015,2016,2018
 ./bin/tests/system/statistics/ns1/root.db      ZONE    2012,2016,2018
 ./bin/tests/system/statistics/ns1/zone.db      ZONE    2015,2016,2018
 ./bin/tests/system/statistics/ns2/example.db   ZONE    2012,2016,2018
 ./bin/tests/system/statistics/ns2/internal.db  ZONE    2012,2016,2018
-./bin/tests/system/statistics/ns2/named.conf.in        CONF-C  2012,2015,2016,2018
 ./bin/tests/system/statistics/ns3/internal.db  ZONE    2012,2016,2018
-./bin/tests/system/statistics/ns3/named.conf.in        CONF-C  2012,2013,2015,2016,2018
 ./bin/tests/system/statistics/ns3/root.hint    ZONE    2012,2016,2018
 ./bin/tests/system/statistics/prereq.sh                SH      2012,2014,2016,2018
 ./bin/tests/system/statistics/setup.sh         SH      2018
 ./bin/tests/system/statschannel/fetch.pl       PERL    2015,2016,2018
 ./bin/tests/system/statschannel/mem-xml.pl     PERL    2017,2018
 ./bin/tests/system/statschannel/ns2/example.db ZONE    2015,2016,2018
-./bin/tests/system/statschannel/ns2/named.conf.in      CONF-C  2015,2016,2017,2018
 ./bin/tests/system/statschannel/prereq.sh      SH      2015,2016,2018
 ./bin/tests/system/statschannel/server-json.pl PERL    2015,2016,2017,2018
 ./bin/tests/system/statschannel/server-xml.pl  PERL    2015,2016,2017,2018
 ./bin/tests/system/stop.sh                     SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/stopall.sh                  SH      2018
 ./bin/tests/system/stress/clean.sh             SH      2000,2001,2004,2007,2012,2014,2016,2018
-./bin/tests/system/stress/ns1/named.conf       CONF-C  2000,2001,2004,2007,2016,2018
-./bin/tests/system/stress/ns2/named.conf       CONF-C  2018
-./bin/tests/system/stress/ns3/named.conf       CONF-C  2000,2001,2004,2007,2013,2016,2017,2018
-./bin/tests/system/stress/ns4/named.conf       CONF-C  2018
 ./bin/tests/system/stress/prereq.sh            SH      2015,2016,2018
 ./bin/tests/system/stress/setup.pl             PERL    2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/stress/setup.sh             SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/stub/clean.sh               SH      2000,2001,2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/stub/knowngood.dig.out.norec        X       2000,2001,2018
 ./bin/tests/system/stub/knowngood.dig.out.rec  X       2000,2001,2013,2018
-./bin/tests/system/stub/ns1/named.conf.in      CONF-C  2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/stub/ns1/root.db            ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/stub/ns2/child.example.db   ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/stub/ns2/named.conf.in      CONF-C  2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/stub/ns3/example.db         ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/stub/ns3/named.conf.in      CONF-C  2000,2001,2004,2007,2016,2017,2018
 ./bin/tests/system/stub/setup.sh               SH      2018
 ./bin/tests/system/stub/tests.sh               SH      2000,2001,2004,2007,2011,2012,2013,2016,2018
 ./bin/tests/system/synthfromdnssec/clean.sh    SH      2017,2018
 ./bin/tests/system/synthfromdnssec/ns1/dnamed.db.in    ZONE    2018
 ./bin/tests/system/synthfromdnssec/ns1/example.db.in   ZONE    2017,2018
-./bin/tests/system/synthfromdnssec/ns1/named.conf.in   CONF-C  2017,2018
 ./bin/tests/system/synthfromdnssec/ns1/root.db.in      ZONE    2017,2018
 ./bin/tests/system/synthfromdnssec/ns1/sign.sh SH      2017,2018
-./bin/tests/system/synthfromdnssec/ns2/named.conf.in   CONF-C  2017,2018
 ./bin/tests/system/synthfromdnssec/ns2/root.hints      ZONE    2017,2018
-./bin/tests/system/synthfromdnssec/ns3/named.conf.in   CONF-C  2017,2018
 ./bin/tests/system/synthfromdnssec/ns3/redirect.db     ZONE    2017,2018
 ./bin/tests/system/synthfromdnssec/ns3/root.hints      ZONE    2017,2018
-./bin/tests/system/synthfromdnssec/ns4/named.conf.in   CONF-C  2017,2018
 ./bin/tests/system/synthfromdnssec/ns4/root.hints      ZONE    2017,2018
-./bin/tests/system/synthfromdnssec/ns5/named.conf.in   CONF-C  2017,2018
 ./bin/tests/system/synthfromdnssec/ns5/root.hints      ZONE    2017,2018
 ./bin/tests/system/synthfromdnssec/setup.sh    SH      2017,2018
 ./bin/tests/system/synthfromdnssec/tests.sh    SH      2017,2018
 ./bin/tests/system/tcp/clean.sh                        SH      2014,2016,2018
-./bin/tests/system/tcp/ns1/named.conf.in       CONF-C  2014,2016,2018
 ./bin/tests/system/tcp/ns1/root.db             ZONE    2014,2016,2018
 ./bin/tests/system/tcp/ns2/example.db          ZONE    2014,2016,2018
-./bin/tests/system/tcp/ns2/named.conf.in       CONF-C  2014,2016,2018
-./bin/tests/system/tcp/ns3/named.conf.in       CONF-C  2014,2016,2018
-./bin/tests/system/tcp/ns4/named.conf.in       CONF-C  2014,2016,2018
 ./bin/tests/system/tcp/setup.sh                        SH      2018
 ./bin/tests/system/tcp/tests.sh                        SH      2014,2016,2018
 ./bin/tests/system/testcrypto.sh               SH      2014,2016,2017,2018
 ./bin/tests/system/tkey/keycreate.c            C       2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2017,2018
 ./bin/tests/system/tkey/keydelete.c            C       2001,2004,2005,2007,2009,2010,2011,2014,2015,2016,2017,2018
 ./bin/tests/system/tkey/ns1/example.db         ZONE    2013,2016,2018
-./bin/tests/system/tkey/ns1/named.conf.in      CONF-C  2001,2004,2007,2009,2011,2013,2014,2016,2017,2018
 ./bin/tests/system/tkey/ns1/setup.sh           SH      2001,2004,2007,2009,2012,2014,2016,2018
 ./bin/tests/system/tkey/setup.sh               SH      2001,2004,2007,2009,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/tkey/tests.sh               SH      2001,2004,2007,2009,2011,2012,2013,2014,2016,2017,2018
 ./bin/tests/system/tools/tests.sh              SH      2017,2018
 ./bin/tests/system/tsig/clean.sh               SH      2005,2006,2007,2012,2014,2016,2018
 ./bin/tests/system/tsig/ns1/example.db         ZONE    2005,2006,2007,2009,2012,2016,2018
-./bin/tests/system/tsig/ns1/named.conf.in      CONF-C  2005,2006,2007,2016,2018
 ./bin/tests/system/tsig/setup.sh               SH      2016,2017,2018
 ./bin/tests/system/tsig/tests.sh               SH      2005,2006,2007,2011,2012,2016,2018
 ./bin/tests/system/tsiggss/authsock.pl         PERL    2011,2012,2016,2018
 ./bin/tests/system/tsiggss/ns1/administrator.ccache    X       2010,2018
 ./bin/tests/system/tsiggss/ns1/dns.keytab      X       2010,2018
 ./bin/tests/system/tsiggss/ns1/example.nil.db.in       X       2011,2018
-./bin/tests/system/tsiggss/ns1/named.conf.in   CONF-C  2010,2011,2013,2016,2018
 ./bin/tests/system/tsiggss/ns1/testdenied.ccache       X       2010,2018
 ./bin/tests/system/tsiggss/prereq.sh           SH      2010,2011,2012,2014,2016,2018
 ./bin/tests/system/tsiggss/setup.sh            SH      2010,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/unknown/ns1/example-class10.db      ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/unknown/ns1/example-in.db   ZONE    2000,2001,2004,2007,2011,2012,2016,2018
 ./bin/tests/system/unknown/ns1/large.db                ZONE    2012,2016,2018
-./bin/tests/system/unknown/ns1/named.conf.in   CONF-C  2000,2001,2004,2007,2016,2018
-./bin/tests/system/unknown/ns2/named.conf.in   CONF-C  2012,2016,2018
-./bin/tests/system/unknown/ns3/named.conf.in   CONF-C  2012,2016,2018
 ./bin/tests/system/unknown/ns3/sign.sh         SH      2012,2014,2016,2017,2018
 ./bin/tests/system/unknown/setup.sh            SH      2012,2014,2016,2017,2018
 ./bin/tests/system/unknown/tests.sh            SH      2000,2001,2004,2007,2011,2012,2013,2016,2018
 ./bin/tests/system/upforwd/knowngood.before    X       2000,2001,2018
 ./bin/tests/system/upforwd/knowngood.ns2.before        X       2000,2001,2018
 ./bin/tests/system/upforwd/ns1/example1.db     ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/upforwd/ns1/named.conf.in   CONF-C  2000,2001,2004,2007,2014,2016,2017,2018
-./bin/tests/system/upforwd/ns2/named.conf.in   CONF-C  2000,2001,2004,2007,2014,2016,2017,2018
-./bin/tests/system/upforwd/ns3/named.conf.in   CONF-C  2000,2001,2004,2007,2011,2014,2016,2017,2018
 ./bin/tests/system/upforwd/ns3/nomaster.db     ZONE    2011,2016,2018
 ./bin/tests/system/upforwd/prereq.sh           SH      2012,2014,2016,2018
 ./bin/tests/system/upforwd/setup.sh            SH      2000,2001,2004,2007,2011,2012,2014,2016,2017,2018
 ./bin/tests/system/verify/zones/genzones.sh    SH      2012,2013,2014,2016,2017,2018
 ./bin/tests/system/verify/zones/unsigned.db    ZONE    2012,2016,2018
 ./bin/tests/system/views/clean.sh              SH      2000,2001,2004,2005,2007,2012,2013,2014,2015,2016,2018
-./bin/tests/system/views/ns1/named.conf.in     CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/views/ns1/root.db           ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/views/ns2/1.10.in-addr.arpa.db      ZONE    2015,2016,2018
 ./bin/tests/system/views/ns2/clone.db          ZONE    2013,2016,2018
 ./bin/tests/system/views/ns2/external/inline.db        ZONE    2014,2016,2018
 ./bin/tests/system/views/ns2/internal.db       ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/views/ns2/internal/inline.db        ZONE    2014,2016,2018
-./bin/tests/system/views/ns2/named1.conf.in    CONF-C  2000,2001,2004,2007,2013,2016,2018
-./bin/tests/system/views/ns2/named2.conf.in    CONF-C  2000,2001,2004,2007,2013,2014,2015,2016,2018
 ./bin/tests/system/views/ns3/child.clone.db    ZONE    2013,2016,2018
 ./bin/tests/system/views/ns3/internal.db       ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/views/ns3/named1.conf.in    CONF-C  2000,2001,2004,2007,2013,2016,2018
-./bin/tests/system/views/ns3/named2.conf.in    CONF-C  2000,2001,2004,2007,2013,2016,2018
 ./bin/tests/system/views/ns5/child.clone.db    ZONE    2013,2016,2018
-./bin/tests/system/views/ns5/named.conf.in     CONF-C  2013,2016,2018
 ./bin/tests/system/views/setup.sh              SH      2000,2001,2004,2007,2012,2014,2016,2017,2018
 ./bin/tests/system/views/tests.sh              SH      2000,2001,2004,2007,2012,2013,2014,2016,2018
 ./bin/tests/system/wildcard/clean.sh           SH      2012,2013,2014,2016,2018
 ./bin/tests/system/wildcard/ns1/dlv.db.in      ZONE    2013,2016,2018
-./bin/tests/system/wildcard/ns1/named.conf.in  CONF-C  2012,2013,2016,2018
 ./bin/tests/system/wildcard/ns1/nsec.db.in     ZONE    2012,2013,2016,2018
 ./bin/tests/system/wildcard/ns1/nsec3.db.in    ZONE    2012,2013,2016,2018
 ./bin/tests/system/wildcard/ns1/private.nsec.db.in     ZONE    2012,2013,2016,2018
 ./bin/tests/system/wildcard/ns1/root.db.in     ZONE    2012,2013,2016,2018
 ./bin/tests/system/wildcard/ns1/sign.sh                SH      2012,2013,2014,2016,2018
 ./bin/tests/system/wildcard/ns2/hints          ZONE    2012,2016,2018
-./bin/tests/system/wildcard/ns2/named.conf.in  CONF-C  2012,2016,2018
 ./bin/tests/system/wildcard/ns3/hints          ZONE    2012,2016,2018
-./bin/tests/system/wildcard/ns3/named.conf.in  CONF-C  2012,2016,2018
-./bin/tests/system/wildcard/ns4/named.conf.in  CONF-C  2012,2016,2018
 ./bin/tests/system/wildcard/ns5/hints          ZONE    2013,2016,2018
-./bin/tests/system/wildcard/ns5/named.conf.in  CONF-C  2013,2016,2018
 ./bin/tests/system/wildcard/setup.sh           SH      2012,2014,2016,2017,2018
 ./bin/tests/system/wildcard/tests.sh           SH      2012,2013,2016,2018
 ./bin/tests/system/win32/bigkey.vcxproj.filters.in     X       2016,2018
 ./bin/tests/system/xfer/knowngood.mapped       X       2016,2018
 ./bin/tests/system/xfer/ns1/axfr-too-big.db    ZONE    2016,2018
 ./bin/tests/system/xfer/ns1/ixfr-too-big.db.in ZONE    2016,2018
-./bin/tests/system/xfer/ns1/named.conf.in      CONF-C  2000,2001,2004,2007,2011,2014,2016,2018
 ./bin/tests/system/xfer/ns1/root.db            ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/xfer/ns2/mapped.db.in       ZONE    2016,2018
-./bin/tests/system/xfer/ns2/named.conf.in      CONF-C  2000,2001,2004,2005,2007,2013,2016,2018
 ./bin/tests/system/xfer/ns2/slave.db.in                ZONE    2013,2016,2018
-./bin/tests/system/xfer/ns3/named.conf.in      CONF-C  2000,2001,2004,2007,2011,2013,2016,2017,2018
-./bin/tests/system/xfer/ns4/named.conf.base    CONF-C  2011,2013,2016,2018
+./bin/tests/system/xfer/ns4/named.conf.base    X       2011,2013,2016,2018
 ./bin/tests/system/xfer/ns4/root.db.in         ZONE    2011,2016,2018
-./bin/tests/system/xfer/ns6/named.conf.in      CONF-C  2011,2014,2016,2018
-./bin/tests/system/xfer/ns7/named.conf.in      CONF-C  2011,2014,2016,2018
 ./bin/tests/system/xfer/ns8/example.db         ZONE    2015,2016,2018
-./bin/tests/system/xfer/ns8/named.conf.in      CONF-C  2015,2016,2018
 ./bin/tests/system/xfer/prereq.sh              SH      2011,2012,2014,2016,2018
 ./bin/tests/system/xfer/setup.sh               SH      2001,2002,2004,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/xfer/tests.sh               SH      2000,2001,2004,2005,2007,2011,2012,2013,2014,2015,2016,2018
 ./bin/tests/system/xferquota/clean.sh          SH      2000,2001,2004,2007,2012,2014,2015,2016,2018
 ./bin/tests/system/xferquota/ns1/changing1.db  ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/xferquota/ns1/changing2.db  ZONE    2000,2001,2004,2007,2016,2018
-./bin/tests/system/xferquota/ns1/named.conf.in CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/xferquota/ns1/root.db       ZONE    2000,2001,2004,2007,2016,2018
 ./bin/tests/system/xferquota/ns2/example.db    ZONE    2000,2001,2002,2003,2004,2007,2009,2016,2018
-./bin/tests/system/xferquota/ns2/named.conf.in CONF-C  2000,2001,2004,2007,2016,2018
 ./bin/tests/system/xferquota/setup.pl          PERL    2000,2001,2004,2007,2011,2012,2016,2018
 ./bin/tests/system/xferquota/setup.sh          SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/xferquota/tests.sh          SH      2000,2001,2004,2007,2012,2016,2018
 ./bin/tests/system/zero/ans5/ans.pl            PERL    2016,2018
 ./bin/tests/system/zero/clean.sh               SH      2013,2014,2015,2016,2018
-./bin/tests/system/zero/ns1/named.conf.in      CONF-C  2013,2016,2017,2018
 ./bin/tests/system/zero/ns1/root.db            ZONE    2013,2016,2018
-./bin/tests/system/zero/ns2/named.conf.in      CONF-C  2013,2016,2017,2018
 ./bin/tests/system/zero/ns2/tld.db             ZONE    2016,2018
-./bin/tests/system/zero/ns3/named.conf.in      CONF-C  2013,2016,2017,2018
 ./bin/tests/system/zero/ns3/root.hint          ZONE    2013,2016,2018
-./bin/tests/system/zero/ns4/named.conf.in      CONF-C  2013,2016,2017,2018
 ./bin/tests/system/zero/ns4/one.tld.db         ZONE    2016,2018
 ./bin/tests/system/zero/prereq.sh              SH      2018
 ./bin/tests/system/zero/setup.sh               SH      2013,2014,2016,2018
 ./bin/tests/system/zonechecks/cname.db         ZONE    2004,2007,2016,2018
 ./bin/tests/system/zonechecks/dname.db         ZONE    2004,2007,2016,2018
 ./bin/tests/system/zonechecks/noaddress.db     ZONE    2004,2007,2016,2018
-./bin/tests/system/zonechecks/ns1/named.conf.in        CONF-C  2012,2013,2014,2015,2016,2017,2018
-./bin/tests/system/zonechecks/ns2/named.conf.in        CONF-C  2012,2013,2016,2017,2018
 ./bin/tests/system/zonechecks/nxdomain.db      ZONE    2004,2007,2016,2018
 ./bin/tests/system/zonechecks/setup.sh         SH      2012,2013,2014,2015,2016,2017,2018
 ./bin/tests/system/zonechecks/tests.sh         SH      2004,2007,2009,2012,2013,2014,2015,2016,2018
 ./bin/tests/virtual-time/README                        TXT.BRIEF       2010,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/clean.sh SH      2010,2012,2015,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/ns1/example.db.in        ZONE    2010,2016,2018
-./bin/tests/virtual-time/autosign-ksk/ns1/named.conf   CONF-C  2010,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/ns1/root.db      ZONE    2010,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/ns1/sign.sh      SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/ns1/wrap.sh      SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/autosign-ksk/tests.sh SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/autosign-zsk/clean.sh SH      2010,2012,2015,2016,2018
 ./bin/tests/virtual-time/autosign-zsk/ns1/example.db.in        ZONE    2010,2016,2018
-./bin/tests/virtual-time/autosign-zsk/ns1/named.conf   CONF-C  2010,2016,2018
 ./bin/tests/virtual-time/autosign-zsk/ns1/root.db      ZONE    2010,2016,2018
 ./bin/tests/virtual-time/autosign-zsk/ns1/sign.sh      SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/autosign-zsk/ns1/wrap.sh      SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/autosign-zsk/setup.sh SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/autosign-zsk/tests.sh SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/cleanall.sh           SH      2010,2012,2016,2017,2018
-./bin/tests/virtual-time/common/controls.conf  CONF-C  2010,2016,2018
-./bin/tests/virtual-time/common/rndc.conf      CONF-C  2010,2016,2018
 ./bin/tests/virtual-time/common/root.hint      ZONE    2010,2016,2018
 ./bin/tests/virtual-time/conf.sh.in            SH      2010,2012,2016,2017,2018
 ./bin/tests/virtual-time/run.sh                        SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/setup.sh              SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/slave/clean.sh                SH      2010,2012,2015,2016,2018
 ./bin/tests/virtual-time/slave/ns1/example.db.in       ZONE    2010,2016,2018
-./bin/tests/virtual-time/slave/ns1/named.conf  CONF-C  2010,2016,2018
 ./bin/tests/virtual-time/slave/ns1/root.db     ZONE    2010,2016,2018
 ./bin/tests/virtual-time/slave/ns1/wrap.sh     SH      2010,2012,2016,2018
 ./bin/tests/virtual-time/slave/setup.sh                SH      2010,2012,2016,2018
 ./conftools/perllib/dnsconf/DNSConf-macros.h   C       2000,2001,2004,2007,2016,2018
 ./conftools/perllib/dnsconf/DNSConf.i          C       2000,2001,2004,2007,2016,2018
 ./conftools/perllib/dnsconf/Makefile.PL                PERL    2000,2001,2004,2007,2012,2016,2018
-./conftools/perllib/dnsconf/named1.conf                CONF-C  2000,2001,2004,2007,2016,2018
 ./conftools/perllib/dnsconf/test.pl            PERL    2000,2001,2004,2007,2012,2016,2018
 ./contrib/README                               X       2014,2015,2016,2017,2018
 ./contrib/dane/mkdane.sh                       X       2012,2018
 ./contrib/dlz/modules/wildcard/README          X       2013,2018
 ./contrib/dlz/modules/wildcard/dlz_wildcard_dynamic.c  X       2013,2015,2016,2018
 ./contrib/dlz/modules/wildcard/testing/named.conf      X       2013,2018
-./contrib/dnspriv/named.conf                   CONF-C  2017,2018
 ./contrib/dnspriv/nginx.conf                   SH      2017,2018
 ./contrib/kasp/README                          X       2016,2018
 ./contrib/kasp/kasp.xml                                X       2016,2018
index 92619e1b7a025cec34aa30571c8ebec6ca0acf60..8c48f643845480eed64af343aeb11e90d4ded497 100644 (file)
@@ -42,6 +42,8 @@ while (<CHANGES>) {
               util/newcopyrights | # our output
               \.bak$ |         # created by update_copyrights
               \.md$ |          # READMEs and such
+              \.conf$ |        # configuration files
+              \.conf\.in$ |    # configuration files
               /(dnssafe|openssl)/.*\.[ch]$ |   # imported
               doc/(draft|expired|rfc)/         # imported
             %x);
@@ -92,10 +94,6 @@ while (<CHANGES>) {
            $base = $base . ".docbook";
        } elsif ($base =~ /\/Makefile$/) {
            $file_types{$_} = "MAKE";
-       } elsif ($base =~ /\/(named|rndc|good|bad).{0,2}\.conf$/) {
-           $file_types{$_} = "CONF-C";
-       } elsif ($base =~ /\/checkconf\/(good|bad)-.*\.conf$/) {
-           $file_types{$_} = "CONF-C";
        } elsif ($base =~ /\/resolv.?\.conf$/) {
            $file_types{$_} = "CONF-SH";
        } elsif ($base =~ /\.(db|hint)$/) {
index a3a0d8552594ff0d69c5ac0a873d0fb2384d8a36..6ceee4d48a3a4937be0f59a904c1094eb11285f0 100644 (file)
@@ -184,7 +184,7 @@ foreach $file (keys %file_types) {
         $start_comment = "";
         $end_comment = "";
         $first = "";
-        if ($type =~ /^(C|YACC|CONF-C)$/) {
+        if ($type =~ /^(C|YACC)$/) {
                 $c_comment = 1;
                 $start_comment = "/*\n";
                 $prefix = " * ";
@@ -518,7 +518,7 @@ foreach $file (keys %file_types) {
                        print TARGET "\n";
                 }
 
-               if (($type eq "C" || $type eq "CONF-C") &&
+               if (($type eq "C") &&
                    $sysyears =~ /$this_year/) {
                        my $body = "";
                        while (<SOURCE>) {