Version in base suite: 9.20.15-1~deb13u1 Base version: bind9_9.20.15-1~deb13u1 Target version: bind9_9.20.18-1~deb13u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/b/bind9/bind9_9.20.15-1~deb13u1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/b/bind9/bind9_9.20.18-1~deb13u1.dsc ChangeLog | 3 Makefile.in | 10 NEWS | 3 bin/Makefile.in | 2 bin/check/Makefile.in | 2 bin/check/check-tool.c | 7 bin/check/named-checkconf.c | 7 bin/check/named-checkzone.c | 15 bin/confgen/Makefile.in | 2 bin/delv/Makefile.in | 2 bin/delv/delv.c | 22 bin/dig/Makefile.in | 2 bin/dig/dighost.c | 26 bin/dnssec/Makefile.in | 2 bin/dnssec/dnssec-dsfromkey.c | 14 bin/dnssec/dnssec-importkey.c | 13 bin/dnssec/dnssec-importkey.rst | 5 bin/dnssec/dnssec-keyfromlabel.c | 14 bin/dnssec/dnssec-keygen.c | 14 bin/dnssec/dnssec-ksr.c | 190 bin/dnssec/dnssec-revoke.c | 14 bin/dnssec/dnssec-settime.c | 17 bin/dnssec/dnssec-signzone.c | 16 bin/dnssec/dnssec-verify.c | 13 bin/dnssec/dnssectool.c | 22 bin/dnssec/dnssectool.h | 4 bin/named/Makefile.in | 2 bin/named/bind9.xsl | 258 - bin/named/config.c | 408 +- bin/named/controlconf.c | 8 bin/named/logconf.c | 7 bin/named/server.c | 245 - bin/named/statschannel.c | 8 bin/named/tkeyconf.c | 23 bin/named/transportconf.c | 42 bin/named/zoneconf.c | 7 bin/nsupdate/Makefile.in | 2 bin/plugins/Makefile.in | 2 bin/plugins/filter-a.c | 8 bin/plugins/filter-aaaa.c | 8 bin/rndc/Makefile.in | 2 bin/rndc/rndc.rst | 34 bin/tests/Makefile.in | 2 bin/tests/convert-trs-to-junit.py | 10 bin/tests/system/Makefile.in | 2 bin/tests/system/README.md | 35 bin/tests/system/_common/trusted.conf.j2 | 18 bin/tests/system/acl/ns2/named.conf.j2 | 62 bin/tests/system/acl/ns2/named1.conf.in | 62 bin/tests/system/acl/ns2/named2.conf.in | 66 bin/tests/system/acl/ns2/named2.conf.j2 | 66 bin/tests/system/acl/ns2/named3.conf.in | 75 bin/tests/system/acl/ns2/named3.conf.j2 | 75 bin/tests/system/acl/ns2/named4.conf.in | 74 bin/tests/system/acl/ns2/named4.conf.j2 | 74 bin/tests/system/acl/ns2/named5.conf.in | 64 bin/tests/system/acl/ns2/named5.conf.j2 | 64 bin/tests/system/acl/ns3/named.conf.in | 36 bin/tests/system/acl/ns3/named.conf.j2 | 36 bin/tests/system/acl/ns4/named.conf.in | 41 bin/tests/system/acl/ns4/named.conf.j2 | 41 bin/tests/system/acl/setup.sh | 3 bin/tests/system/acl/tests.sh | 8 bin/tests/system/additional/ns1/named.conf.j2 | 62 bin/tests/system/additional/ns1/named1.conf.in | 62 bin/tests/system/additional/ns1/named2.conf.in | 62 bin/tests/system/additional/ns1/named2.conf.j2 | 62 bin/tests/system/additional/ns1/named3.conf.in | 63 bin/tests/system/additional/ns1/named3.conf.j2 | 63 bin/tests/system/additional/ns1/named4.conf.in | 72 bin/tests/system/additional/ns1/named4.conf.j2 | 72 bin/tests/system/additional/ns2/named.conf.in | 31 bin/tests/system/additional/ns2/named.conf.j2 | 31 bin/tests/system/additional/ns3/named.conf.in | 43 bin/tests/system/additional/ns3/named.conf.j2 | 43 bin/tests/system/additional/setup.sh | 18 bin/tests/system/additional/tests.sh | 8 bin/tests/system/addzone/ns1/named.conf.in | 48 bin/tests/system/addzone/ns1/named.conf.j2 | 48 bin/tests/system/addzone/ns2/named.conf.j2 | 44 bin/tests/system/addzone/ns2/named1.conf.in | 44 bin/tests/system/addzone/ns2/named2.conf.in | 68 bin/tests/system/addzone/ns2/named2.conf.j2 | 68 bin/tests/system/addzone/ns2/named3.conf.in | 78 bin/tests/system/addzone/ns2/named3.conf.j2 | 78 bin/tests/system/addzone/ns3/named.conf.j2 | 39 bin/tests/system/addzone/ns3/named1.conf.in | 39 bin/tests/system/addzone/ns3/named2.conf.in | 30 bin/tests/system/addzone/ns3/named2.conf.j2 | 30 bin/tests/system/addzone/setup.sh | 4 bin/tests/system/addzone/tests.sh | 8 bin/tests/system/addzone/tests_rndc_deadlock.py | 15 bin/tests/system/allow-query/ns1/named.conf.in | 26 bin/tests/system/allow-query/ns1/named.conf.j2 | 26 bin/tests/system/allow-query/ns2/controls.conf.j2 | 22 bin/tests/system/allow-query/ns2/named.conf.j2 | 33 bin/tests/system/allow-query/ns2/named01.conf.in | 33 bin/tests/system/allow-query/ns2/named02.conf.in | 34 bin/tests/system/allow-query/ns2/named02.conf.j2 | 34 bin/tests/system/allow-query/ns2/named03.conf.in | 34 bin/tests/system/allow-query/ns2/named03.conf.j2 | 34 bin/tests/system/allow-query/ns2/named04.conf.in | 34 bin/tests/system/allow-query/ns2/named04.conf.j2 | 34 bin/tests/system/allow-query/ns2/named05.conf.in | 34 bin/tests/system/allow-query/ns2/named05.conf.j2 | 34 bin/tests/system/allow-query/ns2/named06.conf.in | 34 bin/tests/system/allow-query/ns2/named06.conf.j2 | 34 bin/tests/system/allow-query/ns2/named07.conf.in | 36 bin/tests/system/allow-query/ns2/named07.conf.j2 | 36 bin/tests/system/allow-query/ns2/named08.conf.in | 36 bin/tests/system/allow-query/ns2/named08.conf.j2 | 36 bin/tests/system/allow-query/ns2/named09.conf.in | 36 bin/tests/system/allow-query/ns2/named09.conf.j2 | 36 bin/tests/system/allow-query/ns2/named10.conf.in | 39 bin/tests/system/allow-query/ns2/named10.conf.j2 | 39 bin/tests/system/allow-query/ns2/named11.conf.in | 45 bin/tests/system/allow-query/ns2/named11.conf.j2 | 45 bin/tests/system/allow-query/ns2/named12.conf.in | 39 bin/tests/system/allow-query/ns2/named12.conf.j2 | 39 bin/tests/system/allow-query/ns2/named21.conf.in | 36 bin/tests/system/allow-query/ns2/named21.conf.j2 | 36 bin/tests/system/allow-query/ns2/named22.conf.in | 39 bin/tests/system/allow-query/ns2/named22.conf.j2 | 39 bin/tests/system/allow-query/ns2/named23.conf.in | 38 bin/tests/system/allow-query/ns2/named23.conf.j2 | 38 bin/tests/system/allow-query/ns2/named24.conf.in | 38 bin/tests/system/allow-query/ns2/named24.conf.j2 | 38 bin/tests/system/allow-query/ns2/named25.conf.in | 38 bin/tests/system/allow-query/ns2/named25.conf.j2 | 38 bin/tests/system/allow-query/ns2/named26.conf.in | 38 bin/tests/system/allow-query/ns2/named26.conf.j2 | 38 bin/tests/system/allow-query/ns2/named27.conf.in | 41 bin/tests/system/allow-query/ns2/named27.conf.j2 | 41 bin/tests/system/allow-query/ns2/named28.conf.in | 40 bin/tests/system/allow-query/ns2/named28.conf.j2 | 40 bin/tests/system/allow-query/ns2/named29.conf.in | 40 bin/tests/system/allow-query/ns2/named29.conf.j2 | 40 bin/tests/system/allow-query/ns2/named30.conf.in | 43 bin/tests/system/allow-query/ns2/named30.conf.j2 | 43 bin/tests/system/allow-query/ns2/named31.conf.in | 50 bin/tests/system/allow-query/ns2/named31.conf.j2 | 50 bin/tests/system/allow-query/ns2/named32.conf.in | 43 bin/tests/system/allow-query/ns2/named32.conf.j2 | 43 bin/tests/system/allow-query/ns2/named33.conf.in | 40 bin/tests/system/allow-query/ns2/named33.conf.j2 | 40 bin/tests/system/allow-query/ns2/named34.conf.in | 39 bin/tests/system/allow-query/ns2/named34.conf.j2 | 39 bin/tests/system/allow-query/ns2/named40.conf.in | 108 bin/tests/system/allow-query/ns2/named40.conf.j2 | 108 bin/tests/system/allow-query/ns2/named53.conf.in | 35 bin/tests/system/allow-query/ns2/named53.conf.j2 | 35 bin/tests/system/allow-query/ns2/named54.conf.in | 35 bin/tests/system/allow-query/ns2/named54.conf.j2 | 35 bin/tests/system/allow-query/ns2/named55.conf.in | 40 bin/tests/system/allow-query/ns2/named55.conf.j2 | 40 bin/tests/system/allow-query/ns2/named56.conf.in | 39 bin/tests/system/allow-query/ns2/named56.conf.j2 | 39 bin/tests/system/allow-query/ns2/named57.conf.in | 43 bin/tests/system/allow-query/ns2/named57.conf.j2 | 43 bin/tests/system/allow-query/ns3/named.conf.j2 | 35 bin/tests/system/allow-query/ns3/named1.conf.in | 35 bin/tests/system/allow-query/ns3/named2.conf.in | 38 bin/tests/system/allow-query/ns3/named2.conf.j2 | 38 bin/tests/system/allow-query/ns3/named3.conf.in | 38 bin/tests/system/allow-query/ns3/named3.conf.j2 | 38 bin/tests/system/allow-query/ns3/named4.conf.in | 38 bin/tests/system/allow-query/ns3/named4.conf.j2 | 38 bin/tests/system/allow-query/setup.sh | 19 bin/tests/system/allow-query/tests.sh | 68 bin/tests/system/ans.py | 48 bin/tests/system/auth/ns1/example.net.db | 2 bin/tests/system/auth/tests.sh | 10 bin/tests/system/autosign/ns1/named.conf.in | 47 bin/tests/system/autosign/ns1/named.conf.j2 | 47 bin/tests/system/autosign/ns2/named.conf.in | 148 bin/tests/system/autosign/ns2/named.conf.j2 | 148 bin/tests/system/autosign/ns3/keygen.sh | 141 bin/tests/system/autosign/ns3/named.conf.in | 397 -- bin/tests/system/autosign/ns3/named.conf.j2 | 393 ++ bin/tests/system/autosign/ns3/nsec-only.conf.j2 | 27 bin/tests/system/autosign/ns4/named.conf.in | 35 bin/tests/system/autosign/ns4/named.conf.j2 | 35 bin/tests/system/autosign/ns5/named.conf.in | 33 bin/tests/system/autosign/ns5/named.conf.j2 | 33 bin/tests/system/autosign/setup.sh | 6 bin/tests/system/autosign/tests.sh | 12 bin/tests/system/autosign/tests_sh_autosign.py | 1 bin/tests/system/bailiwick/ans1/ans.py | 68 bin/tests/system/bailiwick/ans1/root.db | 24 bin/tests/system/bailiwick/ans2/ans.py | 110 bin/tests/system/bailiwick/ans2/victim.db | 17 bin/tests/system/bailiwick/ans3/ans.py | 48 bin/tests/system/bailiwick/ans3/attacker.db | 17 bin/tests/system/bailiwick/ans3/victim.db | 16 bin/tests/system/bailiwick/bailiwick_ans.py | 102 bin/tests/system/bailiwick/ns4/named.conf.j2 | 36 bin/tests/system/bailiwick/tests_bailiwick.py | 119 bin/tests/system/catz/ns1/named.conf.in | 164 bin/tests/system/catz/ns1/named.conf.j2 | 179 bin/tests/system/catz/ns2/named.conf.j2 | 235 + bin/tests/system/catz/ns2/named1.conf.in | 214 - bin/tests/system/catz/ns2/named1.conf.j2 | 14 bin/tests/system/catz/ns2/named2.conf.in | 141 bin/tests/system/catz/ns2/named2.conf.j2 | 16 bin/tests/system/catz/ns2/named3.conf.j2 | 16 bin/tests/system/catz/ns2/named4.conf.j2 | 16 bin/tests/system/catz/ns2/named5.conf.j2 | 16 bin/tests/system/catz/ns2/named6.conf.j2 | 16 bin/tests/system/catz/ns2/named7.conf.j2 | 141 bin/tests/system/catz/ns3/named.conf.in | 60 bin/tests/system/catz/ns3/named.conf.j2 | 60 bin/tests/system/catz/ns4/named.conf.in | 67 bin/tests/system/catz/ns4/named.conf.j2 | 81 bin/tests/system/catz/setup.sh | 6 bin/tests/system/catz/tests.sh | 93 bin/tests/system/catz/tests_sh_catz.py | 1 bin/tests/system/chain/ans3/ans.py | 12 bin/tests/system/chain/ans4/ans.py | 19 bin/tests/system/chain/ns1/named.conf.in | 28 bin/tests/system/chain/ns1/named.conf.j2 | 28 bin/tests/system/chain/ns2/named.conf.in | 79 bin/tests/system/chain/ns2/named.conf.j2 | 79 bin/tests/system/chain/ns5/named.conf.in | 47 bin/tests/system/chain/ns5/named.conf.j2 | 47 bin/tests/system/chain/ns7/named.conf.in | 64 bin/tests/system/chain/ns7/named.conf.j2 | 64 bin/tests/system/chain/prereq.sh | 5 bin/tests/system/chain/setup.sh | 5 bin/tests/system/chain/tests_sh_chain.py | 3 bin/tests/system/checkconf-keys/tests_checkconf_keys.py | 58 bin/tests/system/checkconf/bad-remote-servers-key.conf | 15 bin/tests/system/checkconf/bad-remote-servers-tls.conf | 15 bin/tests/system/checkconf/good-remote-servers-named.conf | 27 bin/tests/system/checkds/ns1/named.conf.in | 32 bin/tests/system/checkds/ns1/named.conf.j2 | 32 bin/tests/system/checkds/ns10/named.conf.in | 90 bin/tests/system/checkds/ns10/named.conf.j2 | 90 bin/tests/system/checkds/ns2/named.conf.in | 122 bin/tests/system/checkds/ns2/named.conf.j2 | 122 bin/tests/system/checkds/ns3/named.conf.in | 41 bin/tests/system/checkds/ns3/named.conf.j2 | 41 bin/tests/system/checkds/ns4/named.conf.in | 90 bin/tests/system/checkds/ns4/named.conf.j2 | 90 bin/tests/system/checkds/ns5/named.conf.in | 122 bin/tests/system/checkds/ns5/named.conf.j2 | 122 bin/tests/system/checkds/ns6/named.conf.in | 46 bin/tests/system/checkds/ns6/named.conf.j2 | 46 bin/tests/system/checkds/ns7/named.conf.in | 90 bin/tests/system/checkds/ns7/named.conf.j2 | 90 bin/tests/system/checkds/ns8/named.conf.in | 90 bin/tests/system/checkds/ns8/named.conf.j2 | 90 bin/tests/system/checkds/ns9/named.conf.in | 395 -- bin/tests/system/checkds/ns9/named.conf.j2 | 395 ++ bin/tests/system/checkds/setup.sh | 11 bin/tests/system/checkds/tests_checkds.py | 33 bin/tests/system/checkzone/setup.sh | 2 bin/tests/system/checkzone/zones/bad-cname-and-amtrelay.db | 17 bin/tests/system/checkzone/zones/bad-cname-and-atmrelay.db | 17 bin/tests/system/checkzone/zones/bad-tsig.db.in | 17 bin/tests/system/checkzone/zones/bad-tsig.db.j2 | 19 bin/tests/system/cipher-suites/ns1/named.conf.in | 101 bin/tests/system/cipher-suites/ns1/named.conf.j2 | 101 bin/tests/system/cipher-suites/ns2/named.conf.in | 86 bin/tests/system/cipher-suites/ns2/named.conf.j2 | 86 bin/tests/system/cipher-suites/ns3/named.conf.in | 86 bin/tests/system/cipher-suites/ns3/named.conf.j2 | 86 bin/tests/system/cipher-suites/ns4/named.conf.in | 86 bin/tests/system/cipher-suites/ns4/named.conf.j2 | 86 bin/tests/system/cipher-suites/ns5/named.conf.in | 79 bin/tests/system/cipher-suites/ns5/named.conf.j2 | 79 bin/tests/system/cipher-suites/setup.sh | 6 bin/tests/system/cipher-suites/tests_cipher_suites.py | 4 bin/tests/system/conf.sh | 40 bin/tests/system/conftest.py | 43 bin/tests/system/cookie/ans10/ans.py | 20 bin/tests/system/cookie/ans9/ans.py | 315 - bin/tests/system/cookie/cookie_ans.py | 206 + bin/tests/system/cookie/prereq.sh | 21 bin/tests/system/cookie/tests_sh_cookie.py | 3 bin/tests/system/dialup/ns1/named.conf.in | 41 bin/tests/system/dialup/ns1/named.conf.j2 | 41 bin/tests/system/dialup/ns2/named.conf.in | 41 bin/tests/system/dialup/ns2/named.conf.j2 | 41 bin/tests/system/dialup/ns3/named.conf.in | 40 bin/tests/system/dialup/ns3/named.conf.j2 | 40 bin/tests/system/dialup/setup.sh | 19 bin/tests/system/digdelv/ns1/named.conf.in | 30 bin/tests/system/digdelv/ns1/named.conf.j2 | 30 bin/tests/system/digdelv/ns2/named.conf.in | 39 bin/tests/system/digdelv/ns2/named.conf.j2 | 39 bin/tests/system/digdelv/ns3/named.conf.in | 28 bin/tests/system/digdelv/ns3/named.conf.j2 | 28 bin/tests/system/digdelv/prereq.sh | 5 bin/tests/system/digdelv/setup.sh | 4 bin/tests/system/digdelv/tests.sh | 15 bin/tests/system/dispatch/ans3/ans.py | 6 bin/tests/system/dispatch/tests_connreset.py | 4 bin/tests/system/dlzexternal/driver/Makefile.in | 2 bin/tests/system/dlzexternal/driver/driver.c | 15 bin/tests/system/dlzexternal/ns1/named.conf.in | 85 bin/tests/system/dlzexternal/ns1/named.conf.j2 | 85 bin/tests/system/dlzexternal/setup.sh | 2 bin/tests/system/dns64/ns1/named.conf.j2 | 63 bin/tests/system/dns64/ns1/named.conf1.in | 63 bin/tests/system/dns64/ns1/named.conf2.in | 66 bin/tests/system/dns64/ns1/named.conf3.in | 55 bin/tests/system/dns64/ns1/named2.conf.j2 | 66 bin/tests/system/dns64/ns1/named3.conf.j2 | 55 bin/tests/system/dns64/ns2/named.conf.in | 72 bin/tests/system/dns64/ns2/named.conf.j2 | 72 bin/tests/system/dns64/ns3/named.conf.in | 47 bin/tests/system/dns64/ns3/named.conf.j2 | 47 bin/tests/system/dns64/ns4/named.conf.in | 37 bin/tests/system/dns64/ns4/named.conf.j2 | 37 bin/tests/system/dns64/setup.sh | 5 bin/tests/system/dns64/tests.sh | 4 bin/tests/system/dnssec-malformed-dnskey/ns2/example.db.in | 128 bin/tests/system/dnssec-malformed-dnskey/ns2/named.conf.j2 | 42 bin/tests/system/dnssec-malformed-dnskey/ns2/truncated.selfsigned.db.signed | 40 bin/tests/system/dnssec-malformed-dnskey/ns2/trusted.conf.j2 | 27 bin/tests/system/dnssec-malformed-dnskey/ns3/named.conf.j2 | 39 bin/tests/system/dnssec-malformed-dnskey/ns3/trusted.conf.j2 | 27 bin/tests/system/dnssec-malformed-dnskey/tests_malformed_dnskey.py | 188 bin/tests/system/dnssec/ans10/ans.py | 201 - bin/tests/system/dnssec/ans10/inprogress.db | 13 bin/tests/system/dnssec/ans10/nsec-rrsigs-stripped.db | 13 bin/tests/system/dnssec/ns1/named.conf.in | 36 bin/tests/system/dnssec/ns1/named.conf.j2 | 36 bin/tests/system/dnssec/ns2/example.db.in | 4 bin/tests/system/dnssec/ns2/named.conf.in | 237 - bin/tests/system/dnssec/ns2/named.conf.j2 | 237 + bin/tests/system/dnssec/ns2/sign.sh | 3 bin/tests/system/dnssec/ns3/named.conf.in | 462 -- bin/tests/system/dnssec/ns3/named.conf.j2 | 468 ++ bin/tests/system/dnssec/ns3/sign.sh | 31 bin/tests/system/dnssec/ns3/template.db.in | 27 bin/tests/system/dnssec/ns4/named.conf.j2 | 67 bin/tests/system/dnssec/ns4/named1.conf.in | 67 bin/tests/system/dnssec/ns4/named2.conf.in | 48 bin/tests/system/dnssec/ns4/named2.conf.j2 | 48 bin/tests/system/dnssec/ns4/named3.conf.in | 51 bin/tests/system/dnssec/ns4/named3.conf.j2 | 51 bin/tests/system/dnssec/ns4/named4.conf.in | 89 bin/tests/system/dnssec/ns4/named4.conf.j2 | 89 bin/tests/system/dnssec/ns5/named.conf.j2 | 43 bin/tests/system/dnssec/ns5/named1.conf.in | 43 bin/tests/system/dnssec/ns5/named2.conf.in | 53 bin/tests/system/dnssec/ns5/named2.conf.j2 | 53 bin/tests/system/dnssec/ns6/named.conf.in | 40 bin/tests/system/dnssec/ns6/named.conf.j2 | 40 bin/tests/system/dnssec/ns7/named.conf.in | 76 bin/tests/system/dnssec/ns7/named.conf.j2 | 76 bin/tests/system/dnssec/ns8/named.conf.in | 47 bin/tests/system/dnssec/ns8/named.conf.j2 | 47 bin/tests/system/dnssec/ns9/named.conf.in | 40 bin/tests/system/dnssec/ns9/named.conf.j2 | 40 bin/tests/system/dnssec/prereq.sh | 5 bin/tests/system/dnssec/setup.sh | 13 bin/tests/system/dnssec/tests.sh | 19 bin/tests/system/dnssec/tests_sh_dnssec.py | 4 bin/tests/system/dnstap/tests.sh | 4 bin/tests/system/dnstap/tests_dnstap.py | 21 bin/tests/system/doth/conftest.py | 6 bin/tests/system/doth/example.axfr.good | 4 bin/tests/system/doth/example8.axfr.good | 4 bin/tests/system/doth/ns1/named.conf.in | 205 - bin/tests/system/doth/ns1/named.conf.j2 | 205 + bin/tests/system/doth/ns2/named.conf.in | 199 - bin/tests/system/doth/ns2/named.conf.j2 | 199 + bin/tests/system/doth/ns3/named.conf.in | 81 bin/tests/system/doth/ns3/named.conf.j2 | 81 bin/tests/system/doth/ns4/named.conf.in | 75 bin/tests/system/doth/ns4/named.conf.j2 | 75 bin/tests/system/doth/ns5/named.conf.in | 85 bin/tests/system/doth/ns5/named.conf.j2 | 85 bin/tests/system/doth/setup.sh | 6 bin/tests/system/doth/tests.sh | 24 bin/tests/system/dsdigest/ns1/named.conf.in | 36 bin/tests/system/dsdigest/ns1/named.conf.j2 | 36 bin/tests/system/dsdigest/ns2/named.conf.in | 46 bin/tests/system/dsdigest/ns2/named.conf.j2 | 46 bin/tests/system/dsdigest/ns3/named.conf.in | 39 bin/tests/system/dsdigest/ns3/named.conf.j2 | 39 bin/tests/system/dsdigest/ns4/named.conf.in | 37 bin/tests/system/dsdigest/ns4/named.conf.j2 | 37 bin/tests/system/dsdigest/setup.sh | 5 bin/tests/system/dyndb/driver/Makefile.in | 2 bin/tests/system/dyndb/driver/util.h | 13 bin/tests/system/dyndb/driver/zone.c | 11 bin/tests/system/ecdsa/ns1/named.conf.in | 36 bin/tests/system/ecdsa/ns1/named.conf.j2 | 36 bin/tests/system/ecdsa/ns2/named.conf.in | 36 bin/tests/system/ecdsa/ns2/named.conf.j2 | 36 bin/tests/system/ecdsa/ns3/named.conf.in | 36 bin/tests/system/ecdsa/ns3/named.conf.j2 | 36 bin/tests/system/ecdsa/setup.sh | 3 bin/tests/system/eddsa/ns1/named.conf.in | 36 bin/tests/system/eddsa/ns1/named.conf.j2 | 36 bin/tests/system/eddsa/ns2/named.conf.in | 36 bin/tests/system/eddsa/ns2/named.conf.j2 | 36 bin/tests/system/eddsa/ns3/named.conf.in | 36 bin/tests/system/eddsa/ns3/named.conf.j2 | 36 bin/tests/system/eddsa/setup.sh | 4 bin/tests/system/enginepkcs11/ns1/named.args.in | 1 bin/tests/system/enginepkcs11/ns1/named.args.j2 | 1 bin/tests/system/enginepkcs11/ns1/named.conf.in | 50 bin/tests/system/enginepkcs11/ns1/named.conf.j2 | 50 bin/tests/system/enginepkcs11/ns2/named.args.in | 1 bin/tests/system/enginepkcs11/ns2/named.args.j2 | 1 bin/tests/system/enginepkcs11/ns2/named.conf.in | 57 bin/tests/system/enginepkcs11/ns2/named.conf.j2 | 57 bin/tests/system/enginepkcs11/setup.sh | 10 bin/tests/system/enginepkcs11/tests_sh_enginepkcs11.py | 8 bin/tests/system/feature-test.c | 29 bin/tests/system/fetchlimit/ans4/ans.py | 12 bin/tests/system/fetchlimit/ns1/named.conf.in | 35 bin/tests/system/fetchlimit/ns1/named.conf.j2 | 35 bin/tests/system/fetchlimit/ns2/named.conf.in | 41 bin/tests/system/fetchlimit/ns2/named.conf.j2 | 41 bin/tests/system/fetchlimit/ns3/named.conf.j2 | 48 bin/tests/system/fetchlimit/ns3/named1.conf.in | 48 bin/tests/system/fetchlimit/ns3/named2.conf.in | 46 bin/tests/system/fetchlimit/ns3/named2.conf.j2 | 46 bin/tests/system/fetchlimit/ns3/named3.conf.in | 46 bin/tests/system/fetchlimit/ns3/named3.conf.j2 | 46 bin/tests/system/fetchlimit/ns5/named.conf.j2 | 47 bin/tests/system/fetchlimit/ns5/named1.conf.in | 47 bin/tests/system/fetchlimit/ns5/named2.conf.in | 50 bin/tests/system/fetchlimit/ns5/named2.conf.j2 | 50 bin/tests/system/fetchlimit/ns5/named3.conf.in | 51 bin/tests/system/fetchlimit/ns5/named3.conf.j2 | 51 bin/tests/system/fetchlimit/setup.sh | 19 bin/tests/system/fetchlimit/tests.sh | 8 bin/tests/system/fetchlimit/tests_sh_fetchlimit.py | 3 bin/tests/system/filters/common.py | 8 bin/tests/system/filters/tests_filter_a_v4.py | 12 bin/tests/system/filters/tests_filter_a_v6.py | 12 bin/tests/system/filters/tests_filter_aaaa_v4.py | 12 bin/tests/system/filters/tests_filter_aaaa_v6.py | 12 bin/tests/system/forward/ans11/ans.py | 4 bin/tests/system/forward/ans6/ans.py | 13 bin/tests/system/forward/ns1/named.conf.in | 97 bin/tests/system/forward/ns1/named.conf.j2 | 97 bin/tests/system/forward/ns10/named.conf.in | 54 bin/tests/system/forward/ns10/named.conf.j2 | 54 bin/tests/system/forward/ns2/named-tls.conf.in | 40 bin/tests/system/forward/ns2/named-tls.conf.j2 | 40 bin/tests/system/forward/ns2/named.conf.in | 85 bin/tests/system/forward/ns2/named.conf.j2 | 95 bin/tests/system/forward/ns2/options-tls.conf.in | 18 bin/tests/system/forward/ns3/named.conf.j2 | 67 bin/tests/system/forward/ns3/named1.conf.in | 67 bin/tests/system/forward/ns3/named2.conf.in | 43 bin/tests/system/forward/ns3/named2.conf.j2 | 43 bin/tests/system/forward/ns4/named-tls.conf.in | 83 bin/tests/system/forward/ns4/named-tls.conf.j2 | 83 bin/tests/system/forward/ns4/named.conf.in | 58 bin/tests/system/forward/ns4/named.conf.j2 | 63 bin/tests/system/forward/ns4/options-tls.conf.in | 14 bin/tests/system/forward/ns5/named.conf.in | 37 bin/tests/system/forward/ns5/named.conf.j2 | 37 bin/tests/system/forward/ns7/named.conf.in | 31 bin/tests/system/forward/ns7/named.conf.j2 | 31 bin/tests/system/forward/ns8/named.conf.in | 36 bin/tests/system/forward/ns8/named.conf.j2 | 36 bin/tests/system/forward/ns9/named.conf.j2 | 67 bin/tests/system/forward/ns9/named1.conf.in | 67 bin/tests/system/forward/ns9/named2.conf.in | 70 bin/tests/system/forward/ns9/named2.conf.j2 | 70 bin/tests/system/forward/ns9/named3.conf.in | 50 bin/tests/system/forward/ns9/named3.conf.j2 | 50 bin/tests/system/forward/ns9/named4.conf.in | 47 bin/tests/system/forward/ns9/named4.conf.j2 | 47 bin/tests/system/forward/prereq.sh | 5 bin/tests/system/forward/setup.sh | 30 bin/tests/system/forward/tests.sh | 12 bin/tests/system/forward/tests_sh_forward.py | 5 bin/tests/system/genzone.sh | 4 bin/tests/system/geoip2/ns2/named.conf.j2 | 108 bin/tests/system/geoip2/ns2/named1.conf.in | 108 bin/tests/system/geoip2/ns2/named10.conf.in | 100 bin/tests/system/geoip2/ns2/named10.conf.j2 | 100 bin/tests/system/geoip2/ns2/named11.conf.in | 100 bin/tests/system/geoip2/ns2/named11.conf.j2 | 100 bin/tests/system/geoip2/ns2/named12.conf.in | 41 bin/tests/system/geoip2/ns2/named12.conf.j2 | 41 bin/tests/system/geoip2/ns2/named2.conf.in | 108 bin/tests/system/geoip2/ns2/named2.conf.j2 | 108 bin/tests/system/geoip2/ns2/named3.conf.in | 100 bin/tests/system/geoip2/ns2/named3.conf.j2 | 100 bin/tests/system/geoip2/ns2/named4.conf.in | 84 bin/tests/system/geoip2/ns2/named4.conf.j2 | 84 bin/tests/system/geoip2/ns2/named5.conf.in | 92 bin/tests/system/geoip2/ns2/named5.conf.j2 | 92 bin/tests/system/geoip2/ns2/named6.conf.in | 100 bin/tests/system/geoip2/ns2/named6.conf.j2 | 100 bin/tests/system/geoip2/ns2/named7.conf.in | 100 bin/tests/system/geoip2/ns2/named7.conf.j2 | 100 bin/tests/system/geoip2/ns2/named8.conf.in | 100 bin/tests/system/geoip2/ns2/named8.conf.j2 | 100 bin/tests/system/geoip2/ns2/named9.conf.in | 100 bin/tests/system/geoip2/ns2/named9.conf.j2 | 100 bin/tests/system/geoip2/setup.sh | 2 bin/tests/system/geoip2/tests.sh | 22 bin/tests/system/glue/ns1/named.conf.in | 50 bin/tests/system/glue/ns1/named.conf.j2 | 50 bin/tests/system/glue/setup.sh | 2 bin/tests/system/hooks/driver/Makefile.in | 2 bin/tests/system/hooks/driver/test-async.c | 8 bin/tests/system/hooks/tests_async_plugin.py | 4 bin/tests/system/host/ns1/named.conf.in | 34 bin/tests/system/host/ns1/named.conf.j2 | 34 bin/tests/system/host/setup.sh | 2 bin/tests/system/inline/ns1/named.conf.in | 37 bin/tests/system/inline/ns1/named.conf.j2 | 37 bin/tests/system/inline/ns2/named.conf.in | 67 bin/tests/system/inline/ns2/named.conf.j2 | 67 bin/tests/system/inline/ns3/named.conf.in | 175 bin/tests/system/inline/ns3/named.conf.j2 | 175 bin/tests/system/inline/ns4/named.conf.in | 35 bin/tests/system/inline/ns4/named.conf.j2 | 35 bin/tests/system/inline/ns5/named.conf.j2 | 40 bin/tests/system/inline/ns5/named.conf.post | 50 bin/tests/system/inline/ns5/named.conf.pre | 40 bin/tests/system/inline/ns5/named2.conf.j2 | 50 bin/tests/system/inline/ns6/named.conf.in | 41 bin/tests/system/inline/ns6/named.conf.j2 | 41 bin/tests/system/inline/ns7/named.conf.in | 61 bin/tests/system/inline/ns7/named.conf.j2 | 61 bin/tests/system/inline/ns8/named.conf.in | 170 bin/tests/system/inline/ns8/named.conf.j2 | 170 bin/tests/system/inline/setup.sh | 8 bin/tests/system/inline/tests.sh | 2 bin/tests/system/isctest/__init__.py | 1 bin/tests/system/isctest/asyncserver.py | 332 + bin/tests/system/isctest/check.py | 53 bin/tests/system/isctest/compat.py | 48 bin/tests/system/isctest/instance.py | 114 bin/tests/system/isctest/kasp.py | 239 - bin/tests/system/isctest/log/__init__.py | 2 bin/tests/system/isctest/log/watchlog.py | 147 bin/tests/system/isctest/mark.py | 25 bin/tests/system/isctest/name.py | 42 bin/tests/system/isctest/rndc.py | 69 bin/tests/system/isctest/run.py | 43 bin/tests/system/isctest/template.py | 30 bin/tests/system/isctest/text.py | 178 bin/tests/system/isctest/vars/.ac_vars/JQ.in | 1 bin/tests/system/isctest/vars/.ac_vars/XMLLINT.in | 1 bin/tests/system/isctest/vars/__init__.py | 2 bin/tests/system/isctest/vars/all.py | 2 bin/tests/system/isctest/vars/features.py | 62 bin/tests/system/isctest/vars/openssl.py | 4 bin/tests/system/ixfr/ns1/named.conf.in | 35 bin/tests/system/ixfr/ns1/named.conf.j2 | 35 bin/tests/system/ixfr/ns3/named.conf.in | 53 bin/tests/system/ixfr/ns3/named.conf.j2 | 53 bin/tests/system/ixfr/ns4/named.conf.in | 52 bin/tests/system/ixfr/ns4/named.conf.j2 | 52 bin/tests/system/ixfr/ns5/named.conf.in | 52 bin/tests/system/ixfr/ns5/named.conf.j2 | 52 bin/tests/system/ixfr/setup.sh | 5 bin/tests/system/ixfr/tests.sh | 2 bin/tests/system/journal/ns1/named.conf.in | 98 bin/tests/system/journal/ns1/named.conf.j2 | 98 bin/tests/system/journal/ns2/named.conf.in | 42 bin/tests/system/journal/ns2/named.conf.j2 | 42 bin/tests/system/journal/setup.sh | 2 bin/tests/system/kasp.sh | 1304 ------ bin/tests/system/kasp/ns2/named.conf.in | 61 bin/tests/system/kasp/ns2/named.conf.j2 | 61 bin/tests/system/kasp/ns3/named-common.conf.j2 | 42 bin/tests/system/kasp/ns3/named-fips.conf.in | 323 - bin/tests/system/kasp/ns3/named-fips.conf.j2 | 290 + bin/tests/system/kasp/ns3/named-rsasha1.conf.j2 | 24 bin/tests/system/kasp/ns3/named.conf.in | 28 bin/tests/system/kasp/ns3/named.conf.j2 | 22 bin/tests/system/kasp/ns3/policies/autosign.conf.in | 42 bin/tests/system/kasp/ns3/policies/autosign.conf.j2 | 42 bin/tests/system/kasp/ns3/policies/kasp-fips.conf.in | 121 bin/tests/system/kasp/ns3/policies/kasp-fips.conf.j2 | 121 bin/tests/system/kasp/ns3/policies/kasp-rsasha1.conf.j2 | 32 bin/tests/system/kasp/ns3/policies/kasp.conf.in | 34 bin/tests/system/kasp/ns4/named.conf.in | 187 bin/tests/system/kasp/ns4/named.conf.j2 | 187 bin/tests/system/kasp/ns5/named.conf.in | 130 bin/tests/system/kasp/ns5/named.conf.j2 | 130 bin/tests/system/kasp/ns6/named.conf.in | 51 bin/tests/system/kasp/ns6/named.conf.j2 | 51 bin/tests/system/kasp/ns6/named2.conf.in | 50 bin/tests/system/kasp/ns6/policies/csk1.conf.in | 30 bin/tests/system/kasp/ns6/policies/csk1.conf.j2 | 30 bin/tests/system/kasp/ns6/policies/csk2.conf.in | 30 bin/tests/system/kasp/ns6/policies/kasp-fips.conf.in | 39 bin/tests/system/kasp/ns6/policies/kasp.conf.in | 33 bin/tests/system/kasp/ns6/policies/kasp.conf.j2 | 18 bin/tests/system/kasp/setup.sh | 26 bin/tests/system/kasp/tests_kasp.py | 77 bin/tests/system/keepalive/tests_keepalive.py | 35 bin/tests/system/keyfromlabel/tests_keyfromlabel.py | 29 bin/tests/system/ksr/ns1/named.conf.in | 95 bin/tests/system/ksr/ns1/named.conf.j2 | 95 bin/tests/system/ksr/setup.sh | 2 bin/tests/system/ksr/tests_ksr.py | 473 +- bin/tests/system/legacy/ns1/named.conf.j2 | 45 bin/tests/system/legacy/ns1/named1.conf.in | 39 bin/tests/system/legacy/ns1/named2.conf.in | 31 bin/tests/system/legacy/ns1/named2.conf.j2 | 16 bin/tests/system/legacy/ns10/named.conf.in | 29 bin/tests/system/legacy/ns10/named.conf.j2 | 29 bin/tests/system/legacy/ns2/named.conf.in | 29 bin/tests/system/legacy/ns2/named.conf.j2 | 29 bin/tests/system/legacy/ns3/named.conf.in | 29 bin/tests/system/legacy/ns3/named.conf.j2 | 29 bin/tests/system/legacy/ns4/named.conf.in | 29 bin/tests/system/legacy/ns4/named.conf.j2 | 29 bin/tests/system/legacy/ns5/named.conf.in | 29 bin/tests/system/legacy/ns5/named.conf.j2 | 29 bin/tests/system/legacy/ns6/named.conf.in | 29 bin/tests/system/legacy/ns6/named.conf.j2 | 29 bin/tests/system/legacy/ns7/named.conf.in | 29 bin/tests/system/legacy/ns7/named.conf.j2 | 29 bin/tests/system/legacy/ns8/named.conf.in | 29 bin/tests/system/legacy/ns8/named.conf.j2 | 29 bin/tests/system/legacy/ns9/named.conf.in | 29 bin/tests/system/legacy/ns9/named.conf.j2 | 29 bin/tests/system/legacy/setup.sh | 25 bin/tests/system/legacy/tests.sh | 2 bin/tests/system/logfileconfig/ns1/named.abspath.conf.j2 | 52 bin/tests/system/logfileconfig/ns1/named.abspathconf.in | 52 bin/tests/system/logfileconfig/ns1/named.conf.j2 | 50 bin/tests/system/logfileconfig/ns1/named.dir.conf.j2 | 43 bin/tests/system/logfileconfig/ns1/named.dirconf.in | 43 bin/tests/system/logfileconfig/ns1/named.inc.conf.j2 | 52 bin/tests/system/logfileconfig/ns1/named.incconf.in | 52 bin/tests/system/logfileconfig/ns1/named.iso8601-utc.conf.j2 | 43 bin/tests/system/logfileconfig/ns1/named.iso8601-utc.in | 43 bin/tests/system/logfileconfig/ns1/named.iso8601.conf.j2 | 44 bin/tests/system/logfileconfig/ns1/named.iso8601.in | 44 bin/tests/system/logfileconfig/ns1/named.pipe.conf.j2 | 43 bin/tests/system/logfileconfig/ns1/named.pipeconf.in | 43 bin/tests/system/logfileconfig/ns1/named.plain.conf.j2 | 50 bin/tests/system/logfileconfig/ns1/named.plain.in | 50 bin/tests/system/logfileconfig/ns1/named.plainconf.in | 34 bin/tests/system/logfileconfig/ns1/named.plainlog.conf.j2 | 34 bin/tests/system/logfileconfig/ns1/named.sym.conf.j2 | 43 bin/tests/system/logfileconfig/ns1/named.symconf.in | 43 bin/tests/system/logfileconfig/ns1/named.ts.conf.j2 | 52 bin/tests/system/logfileconfig/ns1/named.tsconf.in | 52 bin/tests/system/logfileconfig/ns1/named.unlimited.conf.j2 | 52 bin/tests/system/logfileconfig/ns1/named.unlimited.in | 52 bin/tests/system/logfileconfig/ns1/named.vers.conf.j2 | 52 bin/tests/system/logfileconfig/ns1/named.versconf.in | 52 bin/tests/system/logfileconfig/setup.sh | 16 bin/tests/system/logfileconfig/tests.sh | 34 bin/tests/system/masterfile/tests_masterfile.py | 6 bin/tests/system/masterformat/ns1/named.conf.in | 136 bin/tests/system/masterformat/ns1/named.conf.j2 | 136 bin/tests/system/masterformat/ns2/named.conf.in | 94 bin/tests/system/masterformat/ns2/named.conf.j2 | 94 bin/tests/system/masterformat/ns3/named.conf.in | 46 bin/tests/system/masterformat/ns3/named.conf.j2 | 46 bin/tests/system/masterformat/ns4/named.conf.j2 | 89 bin/tests/system/masterformat/ns4/named1.conf.in | 89 bin/tests/system/masterformat/ns4/named2.conf.in | 53 bin/tests/system/masterformat/ns4/named2.conf.j2 | 53 bin/tests/system/masterformat/setup.sh | 5 bin/tests/system/masterformat/tests.sh | 2 bin/tests/system/migrate2kasp/tests_migrate2kasp.py | 3 bin/tests/system/mirror/ns1/named.conf.in | 30 bin/tests/system/mirror/ns1/named.conf.j2 | 30 bin/tests/system/mirror/ns2/named.conf.in | 87 bin/tests/system/mirror/ns2/named.conf.j2 | 87 bin/tests/system/mirror/ns3/named.conf.in | 101 bin/tests/system/mirror/ns3/named.conf.j2 | 101 bin/tests/system/mirror/setup.sh | 4 bin/tests/system/mkeys/ns1/named.conf.j2 | 58 bin/tests/system/mkeys/ns1/named1.conf.in | 58 bin/tests/system/mkeys/ns1/named2.conf.in | 58 bin/tests/system/mkeys/ns1/named2.conf.j2 | 58 bin/tests/system/mkeys/ns1/named3.conf.in | 52 bin/tests/system/mkeys/ns1/named3.conf.j2 | 52 bin/tests/system/mkeys/ns2/named.conf.in | 43 bin/tests/system/mkeys/ns2/named.conf.j2 | 43 bin/tests/system/mkeys/ns3/named.conf.in | 45 bin/tests/system/mkeys/ns3/named.conf.j2 | 45 bin/tests/system/mkeys/ns4/named.conf.in | 48 bin/tests/system/mkeys/ns4/named.conf.j2 | 48 bin/tests/system/mkeys/ns5/named.conf.in | 51 bin/tests/system/mkeys/ns5/named.conf.j2 | 51 bin/tests/system/mkeys/ns6/named.conf.in | 44 bin/tests/system/mkeys/ns6/named.conf.j2 | 44 bin/tests/system/mkeys/ns7/named.conf.in | 51 bin/tests/system/mkeys/ns7/named.conf.j2 | 51 bin/tests/system/mkeys/setup.sh | 8 bin/tests/system/mkeys/tests.sh | 4 bin/tests/system/multisigner/ns3/named.conf.in | 55 bin/tests/system/multisigner/ns3/named.conf.j2 | 55 bin/tests/system/multisigner/ns3/setup.sh | 2 bin/tests/system/multisigner/ns4/named.conf.in | 55 bin/tests/system/multisigner/ns4/named.conf.j2 | 55 bin/tests/system/multisigner/ns4/setup.sh | 2 bin/tests/system/multisigner/ns5/named.conf.in | 45 bin/tests/system/multisigner/ns5/named.conf.j2 | 46 bin/tests/system/multisigner/setup.sh | 4 bin/tests/system/multisigner/tests.sh | 771 --- bin/tests/system/multisigner/tests_multisigner.py | 647 +++ bin/tests/system/multisigner/tests_sh_multisigner.py | 39 bin/tests/system/notify/ns1/named.conf.in | 32 bin/tests/system/notify/ns1/named.conf.j2 | 32 bin/tests/system/notify/ns2/named-tls.conf.in | 40 bin/tests/system/notify/ns2/named-tls.conf.j2 | 40 bin/tests/system/notify/ns2/named.conf.in | 89 bin/tests/system/notify/ns2/named.conf.j2 | 99 bin/tests/system/notify/ns2/options-tls.conf.in | 18 bin/tests/system/notify/ns3/named-tls.conf.in | 90 bin/tests/system/notify/ns3/named-tls.conf.j2 | 90 bin/tests/system/notify/ns3/named.conf.in | 47 bin/tests/system/notify/ns3/named.conf.j2 | 53 bin/tests/system/notify/ns3/options-tls.conf.in | 14 bin/tests/system/notify/ns4/named.conf.in | 37 bin/tests/system/notify/ns4/named.conf.j2 | 37 bin/tests/system/notify/ns4/named.port.in | 1 bin/tests/system/notify/ns4/named.port.j2 | 1 bin/tests/system/notify/ns5/named.conf.in | 71 bin/tests/system/notify/ns5/named.conf.j2 | 71 bin/tests/system/notify/setup.sh | 24 bin/tests/system/notify/tests.sh | 4 bin/tests/system/notify/tests_sh_notify.py | 2 bin/tests/system/nsec3-answer/tests_nsec3.py | 16 bin/tests/system/nsec3/common.py | 165 bin/tests/system/nsec3/ns2/named.conf.in | 46 bin/tests/system/nsec3/ns2/named.conf.j2 | 58 bin/tests/system/nsec3/ns2/retransfer.kasp.db.j2 | 31 bin/tests/system/nsec3/ns3/named-common.conf.j2 | 52 bin/tests/system/nsec3/ns3/named-fips.conf.in | 155 bin/tests/system/nsec3/ns3/named-fips.conf.j2 | 179 bin/tests/system/nsec3/ns3/named-retransfer.conf.j2 | 49 bin/tests/system/nsec3/ns3/named-rsasha1.conf.j2 | 76 bin/tests/system/nsec3/ns3/named.conf.j2 | 22 bin/tests/system/nsec3/ns3/named1.conf.in | 67 bin/tests/system/nsec3/ns3/named2-fips.conf.in | 157 bin/tests/system/nsec3/ns3/named2.conf.in | 71 bin/tests/system/nsec3/ns3/nsec3-ent.kasp.db.j2 | 41 bin/tests/system/nsec3/ns3/setup.sh | 30 bin/tests/system/nsec3/ns4/named.conf.j2 | 39 bin/tests/system/nsec3/setup.sh | 8 bin/tests/system/nsec3/tests.sh | 623 --- bin/tests/system/nsec3/tests_nsec3_change.py | 117 bin/tests/system/nsec3/tests_nsec3_initial.py | 300 + bin/tests/system/nsec3/tests_nsec3_reconfig.py | 373 + bin/tests/system/nsec3/tests_nsec3_reload.py | 64 bin/tests/system/nsec3/tests_nsec3_restart.py | 112 bin/tests/system/nsec3/tests_nsec3_retransfer.py | 129 bin/tests/system/nsec3/tests_sh_nsec3.py | 36 bin/tests/system/nslookup/ns1/named.conf.in | 34 bin/tests/system/nslookup/ns1/named.conf.j2 | 34 bin/tests/system/nslookup/setup.sh | 2 bin/tests/system/nsupdate/ans4/ans.pl | 65 bin/tests/system/nsupdate/ans4/ans.py | 27 bin/tests/system/nsupdate/ns1/named.conf.in | 179 bin/tests/system/nsupdate/ns1/named.conf.j2 | 189 bin/tests/system/nsupdate/ns1/tls.conf.in | 40 bin/tests/system/nsupdate/ns1/tls.conf.j2 | 40 bin/tests/system/nsupdate/ns1/tls.options.in | 18 bin/tests/system/nsupdate/ns10/named.conf.in | 55 bin/tests/system/nsupdate/ns10/named.conf.j2 | 61 bin/tests/system/nsupdate/ns2/named.conf.in | 75 bin/tests/system/nsupdate/ns2/named.conf.j2 | 75 bin/tests/system/nsupdate/ns3/named.conf.in | 106 bin/tests/system/nsupdate/ns3/named.conf.j2 | 106 bin/tests/system/nsupdate/ns5/named.conf.in | 42 bin/tests/system/nsupdate/ns5/named.conf.j2 | 42 bin/tests/system/nsupdate/ns6/named.conf.in | 51 bin/tests/system/nsupdate/ns6/named.conf.j2 | 51 bin/tests/system/nsupdate/ns7/named.conf.j2 | 53 bin/tests/system/nsupdate/ns7/named1.conf.in | 53 bin/tests/system/nsupdate/ns7/named2.conf.in | 54 bin/tests/system/nsupdate/ns7/named2.conf.j2 | 54 bin/tests/system/nsupdate/ns8/named.conf.in | 52 bin/tests/system/nsupdate/ns8/named.conf.j2 | 52 bin/tests/system/nsupdate/ns9/named.conf.in | 66 bin/tests/system/nsupdate/ns9/named.conf.j2 | 72 bin/tests/system/nsupdate/setup.sh | 34 bin/tests/system/nsupdate/tests.sh | 2 bin/tests/system/nsupdate/tests_sh_nsupdate.py | 3 bin/tests/system/nsupdate/verylarge.in | 3 bin/tests/system/nsupdate/verylarge.j2 | 3 bin/tests/system/nzd2nzf/tests_nzd2nzf.py | 10 bin/tests/system/optout/ns2/controls.conf.j2 | 22 bin/tests/system/optout/ns2/named.conf.j2 | 57 bin/tests/system/optout/ns2/small.test.db | 25 bin/tests/system/optout/ns2/test.db | 25 bin/tests/system/optout/tests_optout.py | 145 bin/tests/system/padding/ns1/named.conf.in | 39 bin/tests/system/padding/ns1/named.conf.j2 | 39 bin/tests/system/padding/ns2/named.conf.in | 45 bin/tests/system/padding/ns2/named.conf.j2 | 45 bin/tests/system/padding/ns3/named.conf.in | 45 bin/tests/system/padding/ns3/named.conf.j2 | 45 bin/tests/system/padding/ns4/named.conf.in | 45 bin/tests/system/padding/ns4/named.conf.j2 | 45 bin/tests/system/padding/setup.sh | 5 bin/tests/system/pending/ns1/named.conf.in | 31 bin/tests/system/pending/ns1/named.conf.j2 | 31 bin/tests/system/pending/ns2/named.conf.in | 51 bin/tests/system/pending/ns2/named.conf.j2 | 51 bin/tests/system/pending/ns3/named.conf.in | 44 bin/tests/system/pending/ns3/named.conf.j2 | 44 bin/tests/system/pending/ns4/named.conf.in | 31 bin/tests/system/pending/ns4/named.conf.j2 | 31 bin/tests/system/pending/setup.sh | 5 bin/tests/system/pipelined/pipequeries.c | 14 bin/tests/system/proxy/ns1/named.conf.in | 118 bin/tests/system/proxy/ns1/named.conf.j2 | 118 bin/tests/system/proxy/ns3/named.conf.in | 57 bin/tests/system/proxy/ns3/named.conf.j2 | 57 bin/tests/system/proxy/setup.sh | 3 bin/tests/system/qmin/ans2/ans.py | 24 bin/tests/system/qmin/ans3/ans.py | 12 bin/tests/system/qmin/ans4/ans.py | 15 bin/tests/system/qmin/prereq.sh | 21 bin/tests/system/qmin/qmin_ans.py | 5 bin/tests/system/qmin/tests_sh_qmin.py | 3 bin/tests/system/re_compile_checker.py | 46 bin/tests/system/reclimit/ns1/named.conf.in | 39 bin/tests/system/reclimit/ns1/named.conf.j2 | 39 bin/tests/system/reclimit/ns3/named.conf.j2 | 41 bin/tests/system/reclimit/ns3/named1.conf.in | 41 bin/tests/system/reclimit/ns3/named2.conf.in | 40 bin/tests/system/reclimit/ns3/named2.conf.j2 | 40 bin/tests/system/reclimit/ns3/named3.conf.in | 41 bin/tests/system/reclimit/ns3/named3.conf.j2 | 41 bin/tests/system/reclimit/ns3/named4.conf.in | 41 bin/tests/system/reclimit/ns3/named4.conf.j2 | 41 bin/tests/system/reclimit/ns3/named5.conf.in | 42 bin/tests/system/reclimit/ns3/named5.conf.j2 | 42 bin/tests/system/reclimit/ns3/named6.conf.in | 42 bin/tests/system/reclimit/ns3/named6.conf.j2 | 42 bin/tests/system/reclimit/setup.sh | 3 bin/tests/system/reclimit/tests.sh | 26 bin/tests/system/redirect/ns1/named.conf.in | 56 bin/tests/system/redirect/ns1/named.conf.j2 | 56 bin/tests/system/redirect/ns2/named.conf.in | 58 bin/tests/system/redirect/ns2/named.conf.j2 | 58 bin/tests/system/redirect/ns3/named.conf.in | 53 bin/tests/system/redirect/ns3/named.conf.j2 | 53 bin/tests/system/redirect/ns4/named.conf.in | 52 bin/tests/system/redirect/ns4/named.conf.j2 | 52 bin/tests/system/redirect/ns5/named.conf.in | 33 bin/tests/system/redirect/ns5/named.conf.j2 | 33 bin/tests/system/redirect/ns6/named.conf.in | 33 bin/tests/system/redirect/ns6/named.conf.j2 | 33 bin/tests/system/redirect/setup.sh | 7 bin/tests/system/resolver/ns1/named.conf.in | 89 bin/tests/system/resolver/ns1/named.conf.j2 | 55 bin/tests/system/resolver/ns1/named2.conf.j2 | 48 bin/tests/system/resolver/ns11/named.conf.in | 24 bin/tests/system/resolver/ns11/named.conf.j2 | 24 bin/tests/system/resolver/ns4/named.conf.in | 70 bin/tests/system/resolver/ns4/named.conf.j2 | 70 bin/tests/system/resolver/ns5/named.conf.in | 61 bin/tests/system/resolver/ns5/named.conf.j2 | 61 bin/tests/system/resolver/ns6/named.conf.in | 93 bin/tests/system/resolver/ns6/named.conf.j2 | 93 bin/tests/system/resolver/ns7/named.conf.j2 | 76 bin/tests/system/resolver/ns7/named1.conf.in | 76 bin/tests/system/resolver/ns7/named2.conf.in | 76 bin/tests/system/resolver/ns7/named2.conf.j2 | 76 bin/tests/system/resolver/ns9/named.conf.in | 41 bin/tests/system/resolver/ns9/named.conf.j2 | 41 bin/tests/system/resolver/setup.sh | 8 bin/tests/system/resolver/tests.sh | 6 bin/tests/system/resolver/tests_resolver.py | 36 bin/tests/system/rndc/ns2/named.conf.in | 65 bin/tests/system/rndc/ns2/named.conf.j2 | 65 bin/tests/system/rndc/ns2/secondkey.conf.in | 21 bin/tests/system/rndc/ns2/secondkey.conf.j2 | 21 bin/tests/system/rndc/ns3/named.conf.in | 49 bin/tests/system/rndc/ns3/named.conf.j2 | 49 bin/tests/system/rndc/ns4/named.conf.in | 39 bin/tests/system/rndc/ns4/named.conf.j2 | 39 bin/tests/system/rndc/ns5/named.conf.in | 35 bin/tests/system/rndc/ns5/named.conf.j2 | 35 bin/tests/system/rndc/ns6/named.conf.in | 30 bin/tests/system/rndc/ns6/named.conf.j2 | 30 bin/tests/system/rndc/ns7/named.conf.in | 58 bin/tests/system/rndc/ns7/named.conf.j2 | 58 bin/tests/system/rndc/setup.sh | 8 bin/tests/system/rollover-algo-csk/ns1/named.conf.j2 | 31 bin/tests/system/rollover-algo-csk/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-algo-csk/ns2/named.conf.j2 | 49 bin/tests/system/rollover-algo-csk/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-algo-csk/ns3/csk1.conf | 50 bin/tests/system/rollover-algo-csk/ns3/csk2.conf | 50 bin/tests/system/rollover-algo-csk/ns3/named.common.conf.j2 | 47 bin/tests/system/rollover-algo-csk/ns3/named.conf.j2 | 59 bin/tests/system/rollover-algo-csk/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-algo-csk/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-algo-csk/ns6/csk1.conf.j2 | 50 bin/tests/system/rollover-algo-csk/ns6/csk2.conf.j2 | 50 bin/tests/system/rollover-algo-csk/ns6/named.common.conf.j2 | 35 bin/tests/system/rollover-algo-csk/ns6/named.conf.j2 | 59 bin/tests/system/rollover-algo-csk/ns6/template.db.in | 27 bin/tests/system/rollover-algo-csk/setup.sh | 152 bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_initial.py | 46 bin/tests/system/rollover-algo-csk/tests_rollover_algo_csk_reconfig.py | 107 bin/tests/system/rollover-algo-ksk-zsk/ns1/named.conf.j2 | 31 bin/tests/system/rollover-algo-ksk-zsk/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-algo-ksk-zsk/ns2/named.conf.j2 | 49 bin/tests/system/rollover-algo-ksk-zsk/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-algo-ksk-zsk/ns3/kasp.conf | 92 bin/tests/system/rollover-algo-ksk-zsk/ns3/named.common.conf.j2 | 47 bin/tests/system/rollover-algo-ksk-zsk/ns3/named.conf.j2 | 60 bin/tests/system/rollover-algo-ksk-zsk/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-algo-ksk-zsk/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-algo-ksk-zsk/ns6/kasp.conf.j2 | 92 bin/tests/system/rollover-algo-ksk-zsk/ns6/named.common.conf.j2 | 35 bin/tests/system/rollover-algo-ksk-zsk/ns6/named.conf.j2 | 60 bin/tests/system/rollover-algo-ksk-zsk/ns6/template.db.in | 27 bin/tests/system/rollover-algo-ksk-zsk/setup.sh | 201 - bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_initial.py | 35 bin/tests/system/rollover-algo-ksk-zsk/tests_rollover_algo_ksk_zsk_reconfig.py | 109 bin/tests/system/rollover-csk-roll1/ns1/named.conf.j2 | 31 bin/tests/system/rollover-csk-roll1/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-csk-roll1/ns2/named.conf.j2 | 49 bin/tests/system/rollover-csk-roll1/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-csk-roll1/ns3/kasp.conf | 58 bin/tests/system/rollover-csk-roll1/ns3/kasp.conf.j2 | 58 bin/tests/system/rollover-csk-roll1/ns3/named.common.conf.j2 | 14 bin/tests/system/rollover-csk-roll1/ns3/template.db.in | 27 bin/tests/system/rollover-csk-roll1/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-csk-roll1/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-csk-roll1/setup.sh | 314 - bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py | 39 bin/tests/system/rollover-csk-roll2/ns1/named.conf.j2 | 31 bin/tests/system/rollover-csk-roll2/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-csk-roll2/ns2/named.conf.j2 | 49 bin/tests/system/rollover-csk-roll2/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-csk-roll2/ns3/kasp.conf | 58 bin/tests/system/rollover-csk-roll2/ns3/kasp.conf.j2 | 58 bin/tests/system/rollover-csk-roll2/ns3/named.common.conf.j2 | 14 bin/tests/system/rollover-csk-roll2/ns3/template.db.in | 27 bin/tests/system/rollover-csk-roll2/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-csk-roll2/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-csk-roll2/setup.sh | 301 - bin/tests/system/rollover-csk-roll2/tests_rollover_csk_roll2.py | 38 bin/tests/system/rollover-dynamic2inline/ns3/dynamic2inline.kasp.db | 27 bin/tests/system/rollover-dynamic2inline/ns3/named.common.conf.j2 | 47 bin/tests/system/rollover-dynamic2inline/ns3/named.conf.j2 | 21 bin/tests/system/rollover-dynamic2inline/ns6/dynamic2inline.kasp.db | 27 bin/tests/system/rollover-dynamic2inline/ns6/named.common.conf.j2 | 35 bin/tests/system/rollover-dynamic2inline/ns6/named.conf.j2 | 21 bin/tests/system/rollover-dynamic2inline/ns6/template.db.in | 27 bin/tests/system/rollover-dynamic2inline/tests_rollover_dynamic2inline.py | 14 bin/tests/system/rollover-enable-dnssec/ns1/named.conf.j2 | 31 bin/tests/system/rollover-enable-dnssec/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-enable-dnssec/ns2/named.conf.j2 | 49 bin/tests/system/rollover-enable-dnssec/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-enable-dnssec/ns3/kasp.conf | 52 bin/tests/system/rollover-enable-dnssec/ns3/kasp.conf.j2 | 52 bin/tests/system/rollover-enable-dnssec/ns3/named.common.conf.j2 | 14 bin/tests/system/rollover-enable-dnssec/ns3/template.db.in | 27 bin/tests/system/rollover-enable-dnssec/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-enable-dnssec/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-enable-dnssec/setup.sh | 102 bin/tests/system/rollover-enable-dnssec/tests_rollover_enable_dnssec.py | 33 bin/tests/system/rollover-going-insecure/ns1/named.conf.j2 | 31 bin/tests/system/rollover-going-insecure/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-going-insecure/ns2/named.conf.j2 | 49 bin/tests/system/rollover-going-insecure/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-going-insecure/ns3/kasp.conf | 21 bin/tests/system/rollover-going-insecure/ns3/named.common.conf.j2 | 47 bin/tests/system/rollover-going-insecure/ns3/named.conf.j2 | 49 bin/tests/system/rollover-going-insecure/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-going-insecure/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-going-insecure/ns6/kasp.conf.j2 | 21 bin/tests/system/rollover-going-insecure/ns6/named.common.conf.j2 | 35 bin/tests/system/rollover-going-insecure/ns6/named.conf.j2 | 49 bin/tests/system/rollover-going-insecure/ns6/template.db.in | 27 bin/tests/system/rollover-going-insecure/setup.sh | 71 bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_initial.py | 28 bin/tests/system/rollover-going-insecure/tests_rollover_going_insecure_reconfig.py | 40 bin/tests/system/rollover-ksk-3crowd/ns1/named.conf.j2 | 31 bin/tests/system/rollover-ksk-3crowd/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-ksk-3crowd/ns2/named.conf.j2 | 49 bin/tests/system/rollover-ksk-3crowd/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-ksk-3crowd/ns3/kasp.conf | 60 bin/tests/system/rollover-ksk-3crowd/ns3/kasp.conf.j2 | 60 bin/tests/system/rollover-ksk-3crowd/ns3/named.common.conf.j2 | 14 bin/tests/system/rollover-ksk-3crowd/ns3/template.db.in | 27 bin/tests/system/rollover-ksk-3crowd/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-ksk-3crowd/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-ksk-3crowd/setup.sh | 82 bin/tests/system/rollover-ksk-3crowd/tests_rollover_three_is_a_crowd.py | 22 bin/tests/system/rollover-ksk-doubleksk/ns1/named.conf.j2 | 31 bin/tests/system/rollover-ksk-doubleksk/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-ksk-doubleksk/ns2/named.conf.j2 | 49 bin/tests/system/rollover-ksk-doubleksk/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-ksk-doubleksk/ns3/kasp.conf | 60 bin/tests/system/rollover-ksk-doubleksk/ns3/kasp.conf.j2 | 60 bin/tests/system/rollover-ksk-doubleksk/ns3/named.common.conf.j2 | 14 bin/tests/system/rollover-ksk-doubleksk/ns3/template.db.in | 27 bin/tests/system/rollover-ksk-doubleksk/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-ksk-doubleksk/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-ksk-doubleksk/setup.sh | 243 - bin/tests/system/rollover-ksk-doubleksk/tests_rollover_ksk_doubleksk.py | 38 bin/tests/system/rollover-lifetime/ns3/kasp.conf.j2 | 29 bin/tests/system/rollover-lifetime/ns3/limit-lifetime.db | 27 bin/tests/system/rollover-lifetime/ns3/longer-lifetime.db | 27 bin/tests/system/rollover-lifetime/ns3/named.common.conf.j2 | 47 bin/tests/system/rollover-lifetime/ns3/named.conf.j2 | 45 bin/tests/system/rollover-lifetime/ns3/shorter-lifetime.db | 27 bin/tests/system/rollover-lifetime/ns3/template.db.in | 27 bin/tests/system/rollover-lifetime/ns3/unlimit-lifetime.db | 27 bin/tests/system/rollover-lifetime/ns6/kasp.conf.j2 | 29 bin/tests/system/rollover-lifetime/ns6/limit-lifetime.db | 27 bin/tests/system/rollover-lifetime/ns6/longer-lifetime.db | 27 bin/tests/system/rollover-lifetime/ns6/named.common.conf.j2 | 35 bin/tests/system/rollover-lifetime/ns6/named.conf.j2 | 45 bin/tests/system/rollover-lifetime/ns6/shorter-lifetime.db | 27 bin/tests/system/rollover-lifetime/ns6/unlimit-lifetime.db | 27 bin/tests/system/rollover-lifetime/tests_rollover_lifetime_initial.py | 8 bin/tests/system/rollover-lifetime/tests_rollover_lifetime_reconfig.py | 22 bin/tests/system/rollover-multisigner/ns3/named.common.conf.j2 | 14 bin/tests/system/rollover-multisigner/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-multisigner/setup.sh | 67 bin/tests/system/rollover-multisigner/tests_rollover_multisigner.py | 87 bin/tests/system/rollover-straight2none/ns1/named.conf.j2 | 31 bin/tests/system/rollover-straight2none/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-straight2none/ns2/named.conf.j2 | 49 bin/tests/system/rollover-straight2none/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-straight2none/ns3/kasp.conf | 21 bin/tests/system/rollover-straight2none/ns3/named.common.conf.j2 | 47 bin/tests/system/rollover-straight2none/ns3/named.conf.j2 | 31 bin/tests/system/rollover-straight2none/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-straight2none/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-straight2none/ns6/kasp.conf.j2 | 21 bin/tests/system/rollover-straight2none/ns6/named.common.conf.j2 | 35 bin/tests/system/rollover-straight2none/ns6/named.conf.j2 | 31 bin/tests/system/rollover-straight2none/ns6/template.db.in | 27 bin/tests/system/rollover-straight2none/setup.sh | 53 bin/tests/system/rollover-straight2none/tests_rollover_straight2none_initial.py | 70 bin/tests/system/rollover-straight2none/tests_rollover_straight2none_reconfig.py | 79 bin/tests/system/rollover-straight2none/tests_rollver_straight2none_initial.py | 48 bin/tests/system/rollover-straight2none/tests_rollver_straight2none_reconfig.py | 57 bin/tests/system/rollover-zsk-prepub/ns1/named.conf.j2 | 31 bin/tests/system/rollover-zsk-prepub/ns1/root.db.j2.manual | 31 bin/tests/system/rollover-zsk-prepub/ns2/named.conf.j2 | 49 bin/tests/system/rollover-zsk-prepub/ns2/template.db.j2.manual | 40 bin/tests/system/rollover-zsk-prepub/ns3/kasp.conf | 52 bin/tests/system/rollover-zsk-prepub/ns3/kasp.conf.j2 | 52 bin/tests/system/rollover-zsk-prepub/ns3/named.common.conf.j2 | 14 bin/tests/system/rollover-zsk-prepub/ns3/template.db.in | 27 bin/tests/system/rollover-zsk-prepub/ns3/template.db.j2.manual | 34 bin/tests/system/rollover-zsk-prepub/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover-zsk-prepub/setup.sh | 218 - bin/tests/system/rollover-zsk-prepub/tests_rollover_zsk_prepublication.py | 37 bin/tests/system/rollover/common.py | 11 bin/tests/system/rollover/ns1/named.conf.j2 | 31 bin/tests/system/rollover/ns1/root.db.j2.manual | 31 bin/tests/system/rollover/ns2/named.conf.j2 | 49 bin/tests/system/rollover/ns2/template.db.j2.manual | 40 bin/tests/system/rollover/ns3/named.common.conf.j2 | 14 bin/tests/system/rollover/ns3/named.conf.j2 | 7 bin/tests/system/rollover/ns3/template.db.in | 27 bin/tests/system/rollover/ns3/template.db.j2.manual | 34 bin/tests/system/rollover/ns3/trusted.conf.j2 | 18 bin/tests/system/rollover/setup.py | 1948 ++++++++++ bin/tests/system/rollover/setup.sh | 45 bin/tests/system/rollover/tests_rollover_manual.py | 188 bin/tests/system/rootkeysentinel/ns1/named.conf.in | 32 bin/tests/system/rootkeysentinel/ns1/named.conf.j2 | 32 bin/tests/system/rootkeysentinel/ns2/named.conf.in | 32 bin/tests/system/rootkeysentinel/ns2/named.conf.j2 | 32 bin/tests/system/rootkeysentinel/ns3/named.conf.in | 33 bin/tests/system/rootkeysentinel/ns3/named.conf.j2 | 33 bin/tests/system/rootkeysentinel/ns4/named.conf.in | 33 bin/tests/system/rootkeysentinel/ns4/named.conf.j2 | 33 bin/tests/system/rootkeysentinel/setup.sh | 5 bin/tests/system/rpz/dnsrps.zones.in | 60 bin/tests/system/rpz/dnsrps.zones.j2 | 60 bin/tests/system/rpz/ns1/named.conf.in | 38 bin/tests/system/rpz/ns1/named.conf.j2 | 38 bin/tests/system/rpz/ns10/named.conf.in | 43 bin/tests/system/rpz/ns10/named.conf.j2 | 43 bin/tests/system/rpz/ns2/named.conf.in | 56 bin/tests/system/rpz/ns2/named.conf.j2 | 56 bin/tests/system/rpz/ns3/named.conf.in | 182 bin/tests/system/rpz/ns3/named.conf.j2 | 184 bin/tests/system/rpz/ns3/named1.conf.j2 | 184 bin/tests/system/rpz/ns3/named2.conf.j2 | 16 bin/tests/system/rpz/ns4/named.conf.in | 46 bin/tests/system/rpz/ns4/named.conf.j2 | 46 bin/tests/system/rpz/ns5/named.conf.in | 92 bin/tests/system/rpz/ns5/named.conf.j2 | 92 bin/tests/system/rpz/ns6/named.conf.in | 68 bin/tests/system/rpz/ns6/named.conf.j2 | 68 bin/tests/system/rpz/ns7/named.conf.in | 60 bin/tests/system/rpz/ns7/named.conf.j2 | 60 bin/tests/system/rpz/ns8/named.conf.in | 68 bin/tests/system/rpz/ns8/named.conf.j2 | 68 bin/tests/system/rpz/ns9/named.conf.in | 62 bin/tests/system/rpz/ns9/named.conf.j2 | 62 bin/tests/system/rpz/setup.sh | 13 bin/tests/system/rpz/test1 | 99 bin/tests/system/rpz/test1.j2 | 100 bin/tests/system/rpz/test2 | 81 bin/tests/system/rpz/test2.j2 | 82 bin/tests/system/rpz/test3 | 47 bin/tests/system/rpz/test3.j2 | 48 bin/tests/system/rpz/test4 | 36 bin/tests/system/rpz/test4.j2 | 37 bin/tests/system/rpz/test4a | 27 bin/tests/system/rpz/test4a.j2 | 28 bin/tests/system/rpz/test5 | 60 bin/tests/system/rpz/test5.j2 | 61 bin/tests/system/rpz/test6 | 37 bin/tests/system/rpz/test6.j2 | 38 bin/tests/system/rpz/testlib/Makefile.in | 2 bin/tests/system/rpz/tests.sh | 19 bin/tests/system/rpz/tests_sh_rpz.py | 1 bin/tests/system/rpz/tests_sh_rpz_dnsrps.py | 1 bin/tests/system/rpzrecurse/ans5/ans.pl | 81 bin/tests/system/rpzrecurse/ans5/ans.py | 60 bin/tests/system/rpzrecurse/ns1/named.conf.in | 75 bin/tests/system/rpzrecurse/ns1/named.conf.j2 | 75 bin/tests/system/rpzrecurse/ns2/named.conf.header.in | 42 bin/tests/system/rpzrecurse/ns2/named.conf.header.j2 | 42 bin/tests/system/rpzrecurse/ns2/named.conf.j2 | 24 bin/tests/system/rpzrecurse/ns3/named.conf.j2 | 44 bin/tests/system/rpzrecurse/ns3/named1.conf.in | 44 bin/tests/system/rpzrecurse/ns3/named1.conf.j2 | 44 bin/tests/system/rpzrecurse/ns3/named2.conf.in | 43 bin/tests/system/rpzrecurse/ns3/named2.conf.j2 | 43 bin/tests/system/rpzrecurse/ns3/named3.conf.in | 41 bin/tests/system/rpzrecurse/ns3/named3.conf.j2 | 41 bin/tests/system/rpzrecurse/ns4/named.conf.in | 38 bin/tests/system/rpzrecurse/ns4/named.conf.j2 | 38 bin/tests/system/rpzrecurse/setup.sh | 9 bin/tests/system/rpzrecurse/tests.sh | 6 bin/tests/system/rpzrecurse/tests_sh_rpzrecurse.py | 3 bin/tests/system/rpzrecurse/tests_sh_rpzrecurse_dnsrps.py | 3 bin/tests/system/rrchecker/tests_rrchecker.py | 18 bin/tests/system/rsabigexponent/bigkey.c | 26 bin/tests/system/rsabigexponent/ns1/named.conf.in | 34 bin/tests/system/rsabigexponent/ns1/named.conf.j2 | 34 bin/tests/system/rsabigexponent/ns2/named.conf.in | 39 bin/tests/system/rsabigexponent/ns2/named.conf.j2 | 39 bin/tests/system/rsabigexponent/ns3/named.conf.in | 35 bin/tests/system/rsabigexponent/ns3/named.conf.j2 | 35 bin/tests/system/rsabigexponent/setup.sh | 4 bin/tests/system/runtime/ns2/named-alt1.conf.in | 22 bin/tests/system/runtime/ns2/named-alt2.conf.in | 22 bin/tests/system/runtime/ns2/named-alt3.conf.in | 22 bin/tests/system/runtime/ns2/named-alt4.conf.in | 20 bin/tests/system/runtime/ns2/named-alt5.conf.in | 30 bin/tests/system/runtime/ns2/named-alt9.conf.in | 21 bin/tests/system/runtime/ns2/named.conf.j2 | 34 bin/tests/system/runtime/ns2/named1.conf.in | 34 bin/tests/system/runtime/ns2/named1.conf.j2 | 34 bin/tests/system/runtime/ns2/named2.conf.j2 | 22 bin/tests/system/runtime/ns2/named3.conf.j2 | 22 bin/tests/system/runtime/ns2/named4.conf.j2 | 22 bin/tests/system/runtime/ns2/named5.conf.j2 | 20 bin/tests/system/runtime/ns2/named6.conf.j2 | 30 bin/tests/system/runtime/ns2/named7.conf.j2 | 21 bin/tests/system/runtime/setup.sh | 8 bin/tests/system/runtime/tests.sh | 32 bin/tests/system/selftest/tests_zone_analyzer.py | 2 bin/tests/system/serve-stale/ns1/named.conf.j2 | 59 bin/tests/system/serve-stale/ns1/named2.conf.j2 | 16 bin/tests/system/serve-stale/ns1/named3.conf.j2 | 18 bin/tests/system/serve-stale/ns1/named4.conf.j2 | 19 bin/tests/system/serve-stale/ns3/named.conf.in | 51 bin/tests/system/serve-stale/ns3/named.conf.j2 | 51 bin/tests/system/serve-stale/ns3/named1.conf.in | 41 bin/tests/system/serve-stale/ns3/named1.conf.j2 | 41 bin/tests/system/serve-stale/ns3/named2.conf.in | 50 bin/tests/system/serve-stale/ns3/named2.conf.j2 | 50 bin/tests/system/serve-stale/ns3/named3.conf.in | 48 bin/tests/system/serve-stale/ns3/named3.conf.j2 | 48 bin/tests/system/serve-stale/ns3/named4.conf.in | 50 bin/tests/system/serve-stale/ns3/named4.conf.j2 | 50 bin/tests/system/serve-stale/ns3/named5.conf.in | 49 bin/tests/system/serve-stale/ns3/named5.conf.j2 | 49 bin/tests/system/serve-stale/ns3/named6.conf.in | 46 bin/tests/system/serve-stale/ns3/named6.conf.j2 | 46 bin/tests/system/serve-stale/ns3/named7.conf.in | 55 bin/tests/system/serve-stale/ns3/named7.conf.j2 | 55 bin/tests/system/serve-stale/ns3/named8.conf.in | 47 bin/tests/system/serve-stale/ns3/named8.conf.j2 | 47 bin/tests/system/serve-stale/ns3/named9.conf.in | 49 bin/tests/system/serve-stale/ns3/named9.conf.j2 | 49 bin/tests/system/serve-stale/ns4/named.conf.in | 42 bin/tests/system/serve-stale/ns4/named.conf.j2 | 42 bin/tests/system/serve-stale/ns5/named.conf.in | 43 bin/tests/system/serve-stale/ns5/named.conf.j2 | 43 bin/tests/system/serve-stale/ns6/named.conf.in | 45 bin/tests/system/serve-stale/ns6/named.conf.j2 | 45 bin/tests/system/serve-stale/setup.sh | 20 bin/tests/system/serve-stale/tests.sh | 22 bin/tests/system/sfcache/ns1/named.conf.in | 34 bin/tests/system/sfcache/ns1/named.conf.j2 | 34 bin/tests/system/sfcache/ns2/named.conf.in | 49 bin/tests/system/sfcache/ns2/named.conf.j2 | 49 bin/tests/system/sfcache/ns5/named.conf.in | 43 bin/tests/system/sfcache/ns5/named.conf.j2 | 43 bin/tests/system/sfcache/setup.sh | 4 bin/tests/system/shutdown/tests_shutdown.py | 7 bin/tests/system/sortlist/ns1/named.conf.in | 46 bin/tests/system/sortlist/ns1/named.conf.j2 | 46 bin/tests/system/sortlist/setup.sh | 16 bin/tests/system/spf/tests_spf_zones.py | 4 bin/tests/system/staticstub/ns1/named.conf.in | 25 bin/tests/system/staticstub/ns1/named.conf.j2 | 25 bin/tests/system/staticstub/ns2/named.conf.in | 68 bin/tests/system/staticstub/ns2/named.conf.j2 | 74 bin/tests/system/staticstub/ns2/named2.conf.j2 | 16 bin/tests/system/staticstub/ns3/named.conf.in | 51 bin/tests/system/staticstub/ns3/named.conf.j2 | 58 bin/tests/system/staticstub/ns3/named1.conf.j2 | 16 bin/tests/system/staticstub/ns3/named2.conf.j2 | 16 bin/tests/system/staticstub/ns4/named.conf.in | 45 bin/tests/system/staticstub/ns4/named.conf.j2 | 45 bin/tests/system/staticstub/setup.sh | 9 bin/tests/system/staticstub/tests.sh | 9 bin/tests/system/statistics/ans4/ans.pl | 118 bin/tests/system/statistics/ans4/ans.py | 181 bin/tests/system/statistics/ns1/named.conf.in | 42 bin/tests/system/statistics/ns1/named.conf.j2 | 46 bin/tests/system/statistics/ns1/statistics-channels.conf.in | 16 bin/tests/system/statistics/ns2/named.conf.in | 49 bin/tests/system/statistics/ns2/named.conf.j2 | 52 bin/tests/system/statistics/ns2/named1.conf.j2 | 52 bin/tests/system/statistics/ns2/named2.conf.in | 49 bin/tests/system/statistics/ns2/named2.conf.j2 | 53 bin/tests/system/statistics/ns2/statistics-channels.conf.in | 16 bin/tests/system/statistics/ns3/named.conf.in | 57 bin/tests/system/statistics/ns3/named.conf.j2 | 60 bin/tests/system/statistics/ns3/statistics-channels.conf.in | 16 bin/tests/system/statistics/setup.sh | 25 bin/tests/system/statistics/tests.sh | 48 bin/tests/system/statistics/tests_sh_statistics.py | 3 bin/tests/system/statschannel/ns1/named.conf.in | 75 bin/tests/system/statschannel/ns1/named.conf.j2 | 75 bin/tests/system/statschannel/ns2/named.conf.in | 80 bin/tests/system/statschannel/ns2/named.conf.j2 | 81 bin/tests/system/statschannel/ns2/named2.conf.in | 75 bin/tests/system/statschannel/ns2/named2.conf.j2 | 76 bin/tests/system/statschannel/ns2/sign.sh | 23 bin/tests/system/statschannel/ns3/named.conf.in | 65 bin/tests/system/statschannel/ns3/named.conf.j2 | 65 bin/tests/system/statschannel/setup.sh | 4 bin/tests/system/statschannel/tests.sh | 69 bin/tests/system/statschannel/tests_json.py | 3 bin/tests/system/statschannel/tests_sh_statschannel.py | 4 bin/tests/system/statschannel/tests_xml.py | 3 bin/tests/system/statschannel/traffic-json.pl | 49 bin/tests/system/statschannel/traffic-xml.pl | 46 bin/tests/system/stress/ns2/named.conf.in | 57 bin/tests/system/stress/ns2/named.conf.j2 | 57 bin/tests/system/stress/ns3/named.conf.in | 75 bin/tests/system/stress/ns3/named.conf.j2 | 75 bin/tests/system/stress/ns4/named.conf.in | 58 bin/tests/system/stress/ns4/named.conf.j2 | 58 bin/tests/system/stress/setup.sh | 4 bin/tests/system/stress/tests_stress_update.py | 17 bin/tests/system/synthfromdnssec/ns1/named.conf.in | 75 bin/tests/system/synthfromdnssec/ns1/named.conf.j2 | 79 bin/tests/system/synthfromdnssec/ns1/statistics-channels.conf.in | 16 bin/tests/system/synthfromdnssec/ns2/named.conf.in | 55 bin/tests/system/synthfromdnssec/ns2/named.conf.j2 | 59 bin/tests/system/synthfromdnssec/ns2/statistics-channels.conf.in | 16 bin/tests/system/synthfromdnssec/ns3/named.conf.in | 50 bin/tests/system/synthfromdnssec/ns3/named.conf.j2 | 54 bin/tests/system/synthfromdnssec/ns3/statistics-channels.conf.in | 16 bin/tests/system/synthfromdnssec/ns4/named.conf.in | 46 bin/tests/system/synthfromdnssec/ns4/named.conf.j2 | 50 bin/tests/system/synthfromdnssec/ns4/statistics-channels.conf.in | 16 bin/tests/system/synthfromdnssec/ns5/named.conf.in | 58 bin/tests/system/synthfromdnssec/ns5/named.conf.j2 | 62 bin/tests/system/synthfromdnssec/ns5/statistics-channels.conf.in | 16 bin/tests/system/synthfromdnssec/ns6/named.conf.in | 46 bin/tests/system/synthfromdnssec/ns6/named.conf.j2 | 50 bin/tests/system/synthfromdnssec/ns6/statistics-channels.conf.in | 16 bin/tests/system/synthfromdnssec/setup.sh | 11 bin/tests/system/synthfromdnssec/tests.sh | 33 bin/tests/system/timeouts/ns1/named.conf.in | 48 bin/tests/system/timeouts/ns1/named.conf.j2 | 48 bin/tests/system/timeouts/prereq.sh | 28 bin/tests/system/timeouts/setup.sh | 2 bin/tests/system/tools/tests.sh | 2 bin/tests/system/tools/tests_tools_nsec3hash.py | 33 bin/tests/system/transport-acl/ns1/named.conf.in | 130 bin/tests/system/transport-acl/ns1/named.conf.j2 | 130 bin/tests/system/transport-acl/setup.sh | 2 bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.in | 48 bin/tests/system/transport-change/ns1/named-http-plain-proxy.conf.j2 | 48 bin/tests/system/transport-change/ns1/named-http-plain.conf.in | 48 bin/tests/system/transport-change/ns1/named-http-plain.conf.j2 | 48 bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.in | 48 bin/tests/system/transport-change/ns1/named-https-proxy-encrypted.conf.j2 | 48 bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.in | 48 bin/tests/system/transport-change/ns1/named-https-proxy-plain.conf.j2 | 48 bin/tests/system/transport-change/ns1/named-https.conf.in | 48 bin/tests/system/transport-change/ns1/named-https.conf.j2 | 48 bin/tests/system/transport-change/ns1/named-proxy.conf.in | 48 bin/tests/system/transport-change/ns1/named-proxy.conf.j2 | 48 bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.in | 48 bin/tests/system/transport-change/ns1/named-tls-proxy-encrypted.conf.j2 | 48 bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.in | 48 bin/tests/system/transport-change/ns1/named-tls-proxy-plain.conf.j2 | 48 bin/tests/system/transport-change/ns1/named-tls.conf.in | 48 bin/tests/system/transport-change/ns1/named-tls.conf.j2 | 48 bin/tests/system/transport-change/ns1/named.conf.in | 48 bin/tests/system/transport-change/ns1/named.conf.j2 | 48 bin/tests/system/transport-change/setup.sh | 2 bin/tests/system/transport-change/tests.sh | 24 bin/tests/system/tsig/ans2/ans.py | 2 bin/tests/system/tsig/ns1/named-fips.conf.in | 115 bin/tests/system/tsig/ns1/named-md5.conf.j2 | 27 bin/tests/system/tsig/ns1/named.conf.in | 29 bin/tests/system/tsig/ns1/named.conf.j2 | 119 bin/tests/system/tsig/setup.sh | 22 bin/tests/system/tsig/tests_badtime.py | 2 bin/tests/system/tsiggss/ns1/named.conf.in | 50 bin/tests/system/tsiggss/ns1/named.conf.j2 | 52 bin/tests/system/tsiggss/setup.sh | 2 bin/tests/system/upforwd/ns1/named.conf.in | 57 bin/tests/system/upforwd/ns1/named.conf.j2 | 57 bin/tests/system/upforwd/ns2/named.conf.in | 44 bin/tests/system/upforwd/ns2/named.conf.j2 | 44 bin/tests/system/upforwd/ns3/named.conf.j2 | 82 bin/tests/system/upforwd/ns3/named1.conf.in | 82 bin/tests/system/upforwd/ns3/named2.conf.in | 45 bin/tests/system/upforwd/ns3/named2.conf.j2 | 45 bin/tests/system/upforwd/setup.sh | 4 bin/tests/system/upforwd/tests.sh | 2 bin/tests/system/upforwd/tests_sh_upforwd.py | 2 bin/tests/system/verify/tests_verify.py | 73 bin/tests/system/views/ns1/named.conf.in | 30 bin/tests/system/views/ns1/named.conf.j2 | 30 bin/tests/system/views/ns2/named.conf.j2 | 61 bin/tests/system/views/ns2/named1.conf.in | 61 bin/tests/system/views/ns2/named2.conf.in | 109 bin/tests/system/views/ns2/named2.conf.j2 | 109 bin/tests/system/views/ns2/named3.conf.in | 37 bin/tests/system/views/ns2/named3.conf.j2 | 37 bin/tests/system/views/ns3/named.conf.j2 | 51 bin/tests/system/views/ns3/named1.conf.in | 51 bin/tests/system/views/ns3/named2.conf.in | 51 bin/tests/system/views/ns3/named2.conf.j2 | 51 bin/tests/system/views/ns5/named.conf.in | 45 bin/tests/system/views/ns5/named.conf.j2 | 45 bin/tests/system/views/setup.sh | 6 bin/tests/system/views/tests.sh | 10 bin/tests/system/wildcard/ns1/named.conf.in | 49 bin/tests/system/wildcard/ns1/named.conf.j2 | 49 bin/tests/system/wildcard/ns2/named.conf.in | 30 bin/tests/system/wildcard/ns2/named.conf.j2 | 30 bin/tests/system/wildcard/ns3/named.conf.in | 32 bin/tests/system/wildcard/ns3/named.conf.j2 | 32 bin/tests/system/wildcard/ns4/named.conf.in | 31 bin/tests/system/wildcard/ns4/named.conf.j2 | 31 bin/tests/system/wildcard/ns5/named.conf.in | 32 bin/tests/system/wildcard/ns5/named.conf.j2 | 32 bin/tests/system/wildcard/setup.sh | 6 bin/tests/system/xfer-servers-list/ns1/named.conf.j2 | 77 bin/tests/system/xfer-servers-list/ns1/test.db.j2 | 23 bin/tests/system/xfer-servers-list/ns2/named.conf.j2 | 48 bin/tests/system/xfer-servers-list/ns3/named.conf.j2 | 48 bin/tests/system/xfer-servers-list/ns4/named.conf.j2 | 48 bin/tests/system/xfer-servers-list/tests_xfer_servers_list.py | 68 bin/tests/system/xfer/ans10/ans.py | 25 bin/tests/system/xfer/ans9/ans.py | 28 bin/tests/system/xfer/dig1.good | 4 bin/tests/system/xfer/dig2.good | 4 bin/tests/system/xfer/ns1/named.conf.j2 | 94 bin/tests/system/xfer/ns1/named1.conf.in | 94 bin/tests/system/xfer/ns1/named2.conf.in | 52 bin/tests/system/xfer/ns1/named2.conf.j2 | 52 bin/tests/system/xfer/ns1/named3.conf.in | 42 bin/tests/system/xfer/ns1/named3.conf.j2 | 42 bin/tests/system/xfer/ns2/named.conf.in | 89 bin/tests/system/xfer/ns2/named.conf.j2 | 89 bin/tests/system/xfer/ns3/named.conf.in | 82 bin/tests/system/xfer/ns3/named.conf.j2 | 82 bin/tests/system/xfer/ns4/named.conf.base.in | 51 bin/tests/system/xfer/ns4/named.conf.j2 | 51 bin/tests/system/xfer/ns6/named.conf.in | 113 bin/tests/system/xfer/ns6/named.conf.j2 | 113 bin/tests/system/xfer/ns7/named.conf.in | 56 bin/tests/system/xfer/ns7/named.conf.j2 | 56 bin/tests/system/xfer/ns8/named.conf.in | 48 bin/tests/system/xfer/ns8/named.conf.j2 | 48 bin/tests/system/xfer/setup.sh | 9 bin/tests/system/xfer/tests.sh | 4 bin/tests/system/xfer/tests_sh_xfer.py | 3 bin/tests/system/xferquota/ns1/named.conf.in | 47 bin/tests/system/xferquota/ns1/named.conf.j2 | 47 bin/tests/system/xferquota/ns2/named.conf.in | 42 bin/tests/system/xferquota/ns2/named.conf.j2 | 42 bin/tests/system/xferquota/setup.sh | 3 bin/tests/system/xferquota/tests_xferquota.py | 3 bin/tests/system/zero/ans5/ans.py | 10 bin/tests/system/zero/ns1/named.conf.in | 29 bin/tests/system/zero/ns1/named.conf.j2 | 29 bin/tests/system/zero/ns2/named.conf.in | 35 bin/tests/system/zero/ns2/named.conf.j2 | 35 bin/tests/system/zero/ns3/named.conf.in | 31 bin/tests/system/zero/ns3/named.conf.j2 | 31 bin/tests/system/zero/ns4/named.conf.in | 36 bin/tests/system/zero/ns4/named.conf.j2 | 36 bin/tests/system/zero/setup.sh | 5 bin/tests/system/zero/tests_sh_zero.py | 3 bin/tests/system/zonechecks/ns1/named.conf.in | 81 bin/tests/system/zonechecks/ns1/named.conf.j2 | 81 bin/tests/system/zonechecks/ns2/named.conf.in | 43 bin/tests/system/zonechecks/ns2/named.conf.j2 | 43 bin/tests/system/zonechecks/setup.sh | 3 bin/tools/Makefile.in | 2 bin/tools/mdig.c | 84 config.h.in | 3 configure | 141 configure.ac | 10 debian/changelog | 8 doc/Makefile.in | 2 doc/arm/Makefile.in | 2 doc/arm/changelog.rst | 3 doc/arm/notes.rst | 3 doc/arm/platforms.inc.rst | 6 doc/arm/reference.rst | 27 doc/arm/troubleshooting.inc.rst | 2 doc/changelog/changelog-9.20.16.rst | 82 doc/changelog/changelog-9.20.17.rst | 140 doc/changelog/changelog-9.20.18.rst | 105 doc/man/Makefile.in | 2 doc/man/arpaname.1in | 2 doc/man/ddns-confgen.8in | 2 doc/man/delv.1in | 2 doc/man/dig.1in | 2 doc/man/dnssec-cds.1in | 2 doc/man/dnssec-dsfromkey.1in | 2 doc/man/dnssec-importkey.1in | 7 doc/man/dnssec-keyfromlabel.1in | 2 doc/man/dnssec-keygen.1in | 2 doc/man/dnssec-ksr.1in | 2 doc/man/dnssec-revoke.1in | 2 doc/man/dnssec-settime.1in | 2 doc/man/dnssec-signzone.1in | 2 doc/man/dnssec-verify.1in | 2 doc/man/dnstap-read.1in | 2 doc/man/filter-a.8in | 2 doc/man/filter-aaaa.8in | 2 doc/man/host.1in | 2 doc/man/mdig.1in | 2 doc/man/named-checkconf.1in | 2 doc/man/named-checkzone.1in | 2 doc/man/named-compilezone.1in | 2 doc/man/named-journalprint.1in | 2 doc/man/named-nzd2nzf.1in | 2 doc/man/named-rrchecker.1in | 2 doc/man/named.8in | 2 doc/man/named.conf.5in | 2 doc/man/nsec3hash.1in | 2 doc/man/nslookup.1in | 2 doc/man/nsupdate.1in | 2 doc/man/rndc-confgen.8in | 2 doc/man/rndc.8in | 36 doc/man/rndc.conf.5in | 2 doc/man/tsig-keygen.8in | 2 doc/misc/Makefile.in | 2 doc/notes/notes-9.20.16.rst | 52 doc/notes/notes-9.20.17.rst | 80 doc/notes/notes-9.20.18.rst | 87 fuzz/Makefile.in | 2 fuzz/dns_qpkey_name.c | 2 fuzz/dns_rdata_fromwire_text.c | 1 fuzz/fuzz.h | 5 fuzz/isc_lex_getmastertoken.c | 1 fuzz/isc_lex_gettoken.c | 1 lib/Makefile.in | 2 lib/dns/Makefile.in | 2 lib/dns/adb.c | 15 lib/dns/catz.c | 36 lib/dns/client.c | 11 lib/dns/dbiterator.c | 8 lib/dns/diff.c | 133 lib/dns/dnssec.c | 208 - lib/dns/dnstap.c | 7 lib/dns/dst_api.c | 265 - lib/dns/dst_parse.c | 99 lib/dns/dyndb.c | 7 lib/dns/gssapictx.c | 27 lib/dns/include/dns/adb.h | 2 lib/dns/include/dns/catz.h | 18 lib/dns/include/dns/dbiterator.h | 26 lib/dns/include/dns/dnssec.h | 5 lib/dns/include/dns/librpz.h | 2 lib/dns/include/dns/resolver.h | 7 lib/dns/include/dns/rrl.h | 4 lib/dns/include/dns/validator.h | 3 lib/dns/journal.c | 88 lib/dns/keymgr.c | 254 - lib/dns/masterdump.c | 13 lib/dns/nsec3.c | 175 lib/dns/nta.c | 2 lib/dns/openssl_link.c | 22 lib/dns/opensslecdsa_link.c | 180 lib/dns/openssleddsa_link.c | 104 lib/dns/opensslrsa_link.c | 145 lib/dns/private.c | 23 lib/dns/qpcache.c | 23 lib/dns/qpzone.c | 100 lib/dns/rbt-cachedb.c | 7 lib/dns/rbt-zonedb.c | 7 lib/dns/rbt.c | 7 lib/dns/rbtdb.c | 106 lib/dns/rcode.c | 7 lib/dns/rdata.c | 14 lib/dns/rdata/generic/amtrelay_260.c | 26 lib/dns/rdata/generic/brid_68.c | 2 lib/dns/rdata/generic/hhit_67.c | 2 lib/dns/resconf.c | 7 lib/dns/resolver.c | 419 +- lib/dns/sdlz.c | 16 lib/dns/skr.c | 54 lib/dns/tkey.c | 86 lib/dns/ttl.c | 7 lib/dns/update.c | 149 lib/dns/validator.c | 18 lib/dns/view.c | 7 lib/dns/xfrin.c | 131 lib/dns/zone.c | 699 +-- lib/isc/Makefile.in | 2 lib/isc/base32.c | 7 lib/isc/base64.c | 7 lib/isc/hex.c | 7 lib/isc/httpd.c | 8 lib/isc/include/isc/log.h | 1 lib/isc/include/isc/random.h | 7 lib/isc/include/isc/result.h | 1 lib/isc/include/isc/urcu.h | 29 lib/isc/include/isc/util.h | 23 lib/isc/jemalloc_shim.h | 11 lib/isc/mem.c | 106 lib/isc/netmgr/http.c | 8 lib/isc/netmgr/streamdns.c | 16 lib/isc/random.c | 3 lib/isc/result.c | 3 lib/isccc/Makefile.in | 2 lib/isccfg/Makefile.in | 2 lib/isccfg/check.c | 183 lib/isccfg/namedconf.c | 26 lib/isccfg/parser.c | 8 lib/ns/Makefile.in | 2 lib/ns/hooks.c | 8 lib/ns/query.c | 9 lib/ns/update.c | 148 lib/ns/xfrout.c | 31 srcid | 2 tests/Makefile.in | 2 tests/bench/Makefile.in | 2 tests/bench/load-names.c | 22 tests/dns/Makefile.in | 2 tests/dns/db_test.c | 7 tests/dns/dbiterator_test.c | 32 tests/dns/ede_test.c | 2 tests/dns/qp_test.c | 4 tests/dns/qpdb_test.c | 2 tests/dns/qpzone_test.c | 2 tests/dns/rdata_test.c | 10 tests/dns/resolver_test.c | 4 tests/dns/skr_test.c | 5 tests/dns/tsig_test.c | 8 tests/dns/update_test.c | 2 tests/include/tests/isc.h | 14 tests/isc/Makefile.am | 5 tests/isc/Makefile.in | 62 tests/isc/histo_test.c | 6 tests/isc/mem_test.c | 2 tests/isc/random_test.c | 796 ---- tests/isccfg/Makefile.in | 2 tests/libtest/Makefile.in | 2 tests/ns/Makefile.in | 2 1586 files changed, 43217 insertions(+), 39660 deletions(-) dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpunk9l6yl/bind9_9.20.15-1~deb13u1.dsc: no acceptable signature found dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpunk9l6yl/bind9_9.20.18-1~deb13u1.dsc: no acceptable signature found diff -Nru bind9-9.20.15/ChangeLog bind9-9.20.18/ChangeLog --- bind9-9.20.15/ChangeLog 2025-10-18 10:16:12.531731809 +0000 +++ bind9-9.20.18/ChangeLog 2026-01-09 13:39:28.234976206 +0000 @@ -18,6 +18,9 @@ development. Regular users should refer to :ref:`Release Notes ` for changes relevant to them. +.. include:: ../changelog/changelog-9.20.18.rst +.. include:: ../changelog/changelog-9.20.17.rst +.. include:: ../changelog/changelog-9.20.16.rst .. include:: ../changelog/changelog-9.20.15.rst .. include:: ../changelog/changelog-9.20.14.rst .. include:: ../changelog/changelog-9.20.13.rst diff -Nru bind9-9.20.15/Makefile.in bind9-9.20.18/Makefile.in --- bind9-9.20.15/Makefile.in 2025-10-18 10:17:03.875492286 +0000 +++ bind9-9.20.18/Makefile.in 2026-01-09 13:40:25.748483289 +0000 @@ -124,11 +124,13 @@ bin/tests/system/isctest/vars/.ac_vars/TOP_BUILDDIR \ bin/tests/system/isctest/vars/.ac_vars/TOP_SRCDIR \ bin/tests/system/isctest/vars/.ac_vars/FSTRM_CAPTURE \ + bin/tests/system/isctest/vars/.ac_vars/JQ \ bin/tests/system/isctest/vars/.ac_vars/SHELL \ bin/tests/system/isctest/vars/.ac_vars/PYTHON \ bin/tests/system/isctest/vars/.ac_vars/PERL \ bin/tests/system/isctest/vars/.ac_vars/CURL \ bin/tests/system/isctest/vars/.ac_vars/NC \ + bin/tests/system/isctest/vars/.ac_vars/XMLLINT \ bin/tests/system/isctest/vars/.ac_vars/XSLTPROC \ bin/tests/system/isctest/vars/.ac_vars/PYTEST \ util/check-make-install.sh @@ -193,6 +195,7 @@ $(top_srcdir)/Makefile.top \ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/CURL.in \ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/FSTRM_CAPTURE.in \ + $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/JQ.in \ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/NC.in \ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/PERL.in \ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/PYTEST.in \ @@ -200,6 +203,7 @@ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/SHELL.in \ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/TOP_BUILDDIR.in \ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/TOP_SRCDIR.in \ + $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/XMLLINT.in \ $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/XSLTPROC.in \ $(top_srcdir)/doc/doxygen/doxygen-input-filter.in \ $(top_srcdir)/util/check-make-install.sh.in AUTHORS COPYING \ @@ -309,6 +313,7 @@ JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JEMALLOC_VERSION = @JEMALLOC_VERSION@ +JQ = @JQ@ JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -395,6 +400,7 @@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ VERSION = @VERSION@ +XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ @@ -589,6 +595,8 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ bin/tests/system/isctest/vars/.ac_vars/FSTRM_CAPTURE: $(top_builddir)/config.status $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/FSTRM_CAPTURE.in cd $(top_builddir) && $(SHELL) ./config.status $@ +bin/tests/system/isctest/vars/.ac_vars/JQ: $(top_builddir)/config.status $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/JQ.in + cd $(top_builddir) && $(SHELL) ./config.status $@ bin/tests/system/isctest/vars/.ac_vars/SHELL: $(top_builddir)/config.status $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/SHELL.in cd $(top_builddir) && $(SHELL) ./config.status $@ bin/tests/system/isctest/vars/.ac_vars/PYTHON: $(top_builddir)/config.status $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/PYTHON.in @@ -599,6 +607,8 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ bin/tests/system/isctest/vars/.ac_vars/NC: $(top_builddir)/config.status $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/NC.in cd $(top_builddir) && $(SHELL) ./config.status $@ +bin/tests/system/isctest/vars/.ac_vars/XMLLINT: $(top_builddir)/config.status $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/XMLLINT.in + cd $(top_builddir) && $(SHELL) ./config.status $@ bin/tests/system/isctest/vars/.ac_vars/XSLTPROC: $(top_builddir)/config.status $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/XSLTPROC.in cd $(top_builddir) && $(SHELL) ./config.status $@ bin/tests/system/isctest/vars/.ac_vars/PYTEST: $(top_builddir)/config.status $(top_srcdir)/bin/tests/system/isctest/vars/.ac_vars/PYTEST.in diff -Nru bind9-9.20.15/NEWS bind9-9.20.18/NEWS --- bind9-9.20.15/NEWS 2025-10-18 10:16:12.531731809 +0000 +++ bind9-9.20.18/NEWS 2026-01-09 13:39:28.234976206 +0000 @@ -18,6 +18,9 @@ development. Regular users should refer to :ref:`Release Notes ` for changes relevant to them. +.. include:: ../changelog/changelog-9.20.18.rst +.. include:: ../changelog/changelog-9.20.17.rst +.. include:: ../changelog/changelog-9.20.16.rst .. include:: ../changelog/changelog-9.20.15.rst .. include:: ../changelog/changelog-9.20.14.rst .. include:: ../changelog/changelog-9.20.13.rst diff -Nru bind9-9.20.15/bin/Makefile.in bind9-9.20.18/bin/Makefile.in --- bind9-9.20.15/bin/Makefile.in 2025-10-18 10:17:03.890492515 +0000 +++ bind9-9.20.18/bin/Makefile.in 2026-01-09 13:40:25.764483709 +0000 @@ -253,6 +253,7 @@ JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JEMALLOC_VERSION = @JEMALLOC_VERSION@ +JQ = @JQ@ JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -339,6 +340,7 @@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ VERSION = @VERSION@ +XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru bind9-9.20.15/bin/check/Makefile.in bind9-9.20.18/bin/check/Makefile.in --- bind9-9.20.15/bin/check/Makefile.in 2025-10-18 10:17:03.918492944 +0000 +++ bind9-9.20.18/bin/check/Makefile.in 2026-01-09 13:40:25.793484470 +0000 @@ -272,6 +272,7 @@ JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JEMALLOC_VERSION = @JEMALLOC_VERSION@ +JQ = @JQ@ JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -358,6 +359,7 @@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ VERSION = @VERSION@ +XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru bind9-9.20.15/bin/check/check-tool.c bind9-9.20.18/bin/check/check-tool.c --- bind9-9.20.15/bin/check/check-tool.c 2025-10-18 10:16:12.247727392 +0000 +++ bind9-9.20.18/bin/check/check-tool.c 2026-01-09 13:39:27.942968543 +0000 @@ -57,13 +57,6 @@ #define CHECK_LOCAL 1 #endif /* ifndef CHECK_LOCAL */ -#define CHECK(r) \ - do { \ - result = (r); \ - if (result != ISC_R_SUCCESS) \ - goto cleanup; \ - } while (0) - #define ERR_IS_CNAME 1 #define ERR_NO_ADDRESSES 2 #define ERR_LOOKUP_FAILURE 3 diff -Nru bind9-9.20.15/bin/check/named-checkconf.c bind9-9.20.18/bin/check/named-checkconf.c --- bind9-9.20.15/bin/check/named-checkconf.c 2025-10-18 10:16:12.247727392 +0000 +++ bind9-9.20.18/bin/check/named-checkconf.c 2026-01-09 13:39:27.943968569 +0000 @@ -46,13 +46,6 @@ isc_log_t *logc = NULL; -#define CHECK(r) \ - do { \ - result = (r); \ - if (result != ISC_R_SUCCESS) \ - goto cleanup; \ - } while (0) - /*% usage */ noreturn static void usage(void); diff -Nru bind9-9.20.15/bin/check/named-checkzone.c bind9-9.20.18/bin/check/named-checkzone.c --- bind9-9.20.15/bin/check/named-checkzone.c 2025-10-18 10:16:12.247727392 +0000 +++ bind9-9.20.18/bin/check/named-checkzone.c 2026-01-09 13:39:27.943968569 +0000 @@ -63,10 +63,10 @@ } while (0) noreturn static void -usage(void); +usage(int ret); static void -usage(void) { +usage(int ret) { fprintf(stderr, "usage: %s [-djqvD] [-c class] " "[-f inputformat] [-F outputformat] [-J filename] " @@ -79,7 +79,7 @@ "%s zonename [ (filename|-) ]\n", prog_name, progmode == progmode_check ? "[-o filename]" : "-o filename"); - exit(EXIT_FAILURE); + exit(ret); } static void @@ -431,9 +431,10 @@ fprintf(stderr, "%s: invalid argument -%c\n", prog_name, isc_commandline_option); } - FALLTHROUGH; + usage(EXIT_FAILURE); + case 'h': - usage(); + usage(EXIT_SUCCESS); default: fprintf(stderr, "%s: unhandled option -%c\n", prog_name, @@ -496,7 +497,7 @@ if (output_filename == NULL) { fprintf(stderr, "output file required, but not " "specified\n"); - usage(); + usage(EXIT_FAILURE); } } @@ -520,7 +521,7 @@ if (argc - isc_commandline_index < 1 || argc - isc_commandline_index > 2) { - usage(); + usage(EXIT_FAILURE); } isc_mem_create(&mctx); diff -Nru bind9-9.20.15/bin/confgen/Makefile.in bind9-9.20.18/bin/confgen/Makefile.in --- bind9-9.20.15/bin/confgen/Makefile.in 2025-10-18 10:17:03.944493342 +0000 +++ bind9-9.20.18/bin/confgen/Makefile.in 2026-01-09 13:40:25.822485230 +0000 @@ -271,6 +271,7 @@ JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JEMALLOC_VERSION = @JEMALLOC_VERSION@ +JQ = @JQ@ JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -357,6 +358,7 @@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ VERSION = @VERSION@ +XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru bind9-9.20.15/bin/delv/Makefile.in bind9-9.20.18/bin/delv/Makefile.in --- bind9-9.20.15/bin/delv/Makefile.in 2025-10-18 10:17:03.968493710 +0000 +++ bind9-9.20.18/bin/delv/Makefile.in 2026-01-09 13:40:25.851485991 +0000 @@ -258,6 +258,7 @@ JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JEMALLOC_VERSION = @JEMALLOC_VERSION@ +JQ = @JQ@ JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -344,6 +345,7 @@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ VERSION = @VERSION@ +XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru bind9-9.20.15/bin/delv/delv.c bind9-9.20.18/bin/delv/delv.c --- bind9-9.20.15/bin/delv/delv.c 2025-10-18 10:16:12.249727423 +0000 +++ bind9-9.20.18/bin/delv/delv.c 2026-01-09 13:39:27.945968622 +0000 @@ -79,13 +79,6 @@ #include -#define CHECK(r) \ - do { \ - result = (r); \ - if (result != ISC_R_SUCCESS) \ - goto cleanup; \ - } while (0) - #define MAXNAME (DNS_NAME_MAXTEXT + 1) #define MAX_QUERIES 50 @@ -171,8 +164,11 @@ static isc_result_t parse_uint(uint32_t *uip, const char *value, uint32_t max, const char *desc); +noreturn static void +usage(int ret); + static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage: delv [@server] {q-opt} {d-opt} [domain] [q-type] " "[q-class]\n" @@ -256,7 +252,7 @@ "process)\n" " +[no]yaml (Present the results as " "YAML)\n"); - exit(EXIT_FAILURE); + exit(ret); } noreturn static void @@ -1438,7 +1434,7 @@ invalid_option: need_value: fprintf(stderr, "Invalid option: +%s\n", option); - usage(); + usage(EXIT_FAILURE); } return; } @@ -1491,8 +1487,8 @@ } break; case 'h': - usage(); - exit(EXIT_SUCCESS); + usage(EXIT_SUCCESS); + case 'i': no_sigs = true; root_validation = false; @@ -1645,7 +1641,7 @@ invalid_option: default: fprintf(stderr, "Invalid option: -%s\n", option); - usage(); + usage(EXIT_FAILURE); } UNREACHABLE(); return false; diff -Nru bind9-9.20.15/bin/dig/Makefile.in bind9-9.20.18/bin/dig/Makefile.in --- bind9-9.20.15/bin/dig/Makefile.in 2025-10-18 10:17:03.996494139 +0000 +++ bind9-9.20.18/bin/dig/Makefile.in 2026-01-09 13:40:25.882486804 +0000 @@ -282,6 +282,7 @@ JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JEMALLOC_VERSION = @JEMALLOC_VERSION@ +JQ = @JQ@ JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -368,6 +369,7 @@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ VERSION = @VERSION@ +XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru bind9-9.20.15/bin/dig/dighost.c bind9-9.20.18/bin/dig/dighost.c --- bind9-9.20.15/bin/dig/dighost.c 2025-10-18 10:16:12.251727455 +0000 +++ bind9-9.20.18/bin/dig/dighost.c 2026-01-09 13:39:27.946968648 +0000 @@ -3398,6 +3398,14 @@ return false; } + /* + * We reach here only when either start_udp or start_tcp fails in + * get_address(), at which point lookup's current_query must be attached + * to the query that just failed. We need to detach it before trying + * the next server similar to, e.g., recv_done(). + */ + query_detach(&lookup->current_query); + debug("trying next server..."); if (lookup->tcp_mode) { @@ -3430,19 +3438,11 @@ return; } - if (l->retries > 1) { - l->retries--; - debug("making new %s request, %d tries left", - l->tcp_mode ? "TCP" : "UDP", l->retries); - requeue_lookup(l, true); - lookup_detach(&l); - isc_refcount_decrement0(&recvcount); - debug("recvcount=%" PRIuFAST32, - isc_refcount_current(&recvcount)); - query_detach(&query); - clear_current_lookup(); - return; - } + /* + * We don't retry this server unlike other similar cases such as + * recv_done() because we're here due to get_address() failure, + * which shouldn't be transient. + */ if (query->readhandle != NULL) { isc_refcount_decrement0(&recvcount); diff -Nru bind9-9.20.15/bin/dnssec/Makefile.in bind9-9.20.18/bin/dnssec/Makefile.in --- bind9-9.20.15/bin/dnssec/Makefile.in 2025-10-18 10:17:04.031494675 +0000 +++ bind9-9.20.18/bin/dnssec/Makefile.in 2026-01-09 13:40:25.919487775 +0000 @@ -328,6 +328,7 @@ JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JEMALLOC_VERSION = @JEMALLOC_VERSION@ +JQ = @JQ@ JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -414,6 +415,7 @@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ VERSION = @VERSION@ +XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru bind9-9.20.15/bin/dnssec/dnssec-dsfromkey.c bind9-9.20.18/bin/dnssec/dnssec-dsfromkey.c --- bind9-9.20.15/bin/dnssec/dnssec-dsfromkey.c 2025-10-18 10:16:12.252727470 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-dsfromkey.c 2026-01-09 13:39:27.948968701 +0000 @@ -331,10 +331,10 @@ } noreturn static void -usage(void); +usage(int ret); static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s [options] keyfile\n\n", program); fprintf(stderr, " %s [options] -f zonefile [zonename]\n\n", program); @@ -361,7 +361,7 @@ " -V: print version information\n"); fprintf(stderr, "Output: DS or CDS RRs\n"); - exit(EXIT_FAILURE); + exit(ret); } int @@ -381,7 +381,7 @@ dns_rdata_init(&rdata); if (argc == 1) { - usage(); + usage(EXIT_FAILURE); } isc_mem_create(&mctx); @@ -451,10 +451,12 @@ fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); } - FALLTHROUGH; + /* Does not return. */ + usage(EXIT_FAILURE); + case 'h': /* Does not return. */ - usage(); + usage(EXIT_SUCCESS); case 'V': /* Does not return. */ diff -Nru bind9-9.20.15/bin/dnssec/dnssec-importkey.c bind9-9.20.18/bin/dnssec/dnssec-importkey.c --- bind9-9.20.15/bin/dnssec/dnssec-importkey.c 2025-10-18 10:16:12.252727470 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-importkey.c 2026-01-09 13:39:27.948968701 +0000 @@ -264,10 +264,10 @@ } noreturn static void -usage(void); +usage(int ret); static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s options [-K dir] keyfile\n\n", program); fprintf(stderr, " %s options -f file [keyname]\n\n", program); @@ -290,7 +290,7 @@ fprintf(stderr, " -D sync date/[+-]offset/none: set/unset " "CDS and CDNSKEY deletion date\n"); - exit(EXIT_FAILURE); + exit(ret); } int @@ -308,7 +308,7 @@ dns_rdata_init(&rdata); if (argc == 1) { - usage(); + usage(EXIT_FAILURE); } isc_mem_create(&mctx); @@ -384,10 +384,11 @@ fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); } - FALLTHROUGH; + usage(EXIT_FAILURE); + case 'h': /* Does not return. */ - usage(); + usage(EXIT_SUCCESS); case 'V': /* Does not return. */ diff -Nru bind9-9.20.15/bin/dnssec/dnssec-importkey.rst bind9-9.20.18/bin/dnssec/dnssec-importkey.rst --- bind9-9.20.15/bin/dnssec/dnssec-importkey.rst 2025-10-18 10:16:12.252727470 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-importkey.rst 2026-01-09 13:39:27.948968701 +0000 @@ -40,6 +40,11 @@ key, which means the public key can be added to and removed from the DNSKEY RRset on schedule even if the true private key is stored offline. +When using ``dnssec-policy``, do not use :program:`dnssec-importkey` to +import key files that cannot be used for signing. In this case, simply publish the +imported DNSKEY record in the zone, and make sure that the files are outside +the configured ``key-directory``. + Options ~~~~~~~ diff -Nru bind9-9.20.15/bin/dnssec/dnssec-keyfromlabel.c bind9-9.20.18/bin/dnssec/dnssec-keyfromlabel.c --- bind9-9.20.15/bin/dnssec/dnssec-keyfromlabel.c 2025-10-18 10:16:12.253727485 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-keyfromlabel.c 2026-01-09 13:39:27.948968701 +0000 @@ -46,10 +46,10 @@ static uint16_t tag_min = 0, tag_max = 0xffff; noreturn static void -usage(void); +usage(int ret); static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s -l label [options] name\n\n", program); fprintf(stderr, "Version: %s\n", PACKAGE_VERSION); @@ -105,7 +105,7 @@ fprintf(stderr, " K++.key, " "K++.private\n"); - exit(EXIT_FAILURE); + exit(ret); } int @@ -156,7 +156,7 @@ isc_stdtime_t now = isc_stdtime_now(); if (argc == 1) { - usage(); + usage(EXIT_FAILURE); } isc_mem_create(&mctx); @@ -336,10 +336,12 @@ fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); } - FALLTHROUGH; + /* Does not return. */ + usage(EXIT_FAILURE); + case 'h': /* Does not return. */ - usage(); + usage(EXIT_SUCCESS); case 'V': /* Does not return. */ diff -Nru bind9-9.20.15/bin/dnssec/dnssec-keygen.c bind9-9.20.18/bin/dnssec/dnssec-keygen.c --- bind9-9.20.15/bin/dnssec/dnssec-keygen.c 2025-10-18 10:16:12.253727485 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-keygen.c 2026-01-09 13:39:27.949968727 +0000 @@ -75,7 +75,7 @@ isc_log_t *lctx = NULL; noreturn static void -usage(void); +usage(int ret); static void progress(int p); @@ -140,7 +140,7 @@ typedef struct keygen_ctx keygen_ctx_t; static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s [options] name\n\n", program); fprintf(stderr, "Version: %s\n", PACKAGE_VERSION); @@ -226,7 +226,7 @@ fprintf(stderr, " K++.key, " "K++.private\n"); - exit(EXIT_FAILURE); + exit(ret); } static void @@ -879,7 +879,7 @@ }; if (argc == 1) { - usage(); + usage(EXIT_FAILURE); } isc_commandline_errprint = false; @@ -1134,10 +1134,12 @@ fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); } - FALLTHROUGH; + /* Does not return. */ + usage(EXIT_FAILURE); + case 'h': /* Does not return. */ - usage(); + usage(EXIT_SUCCESS); case 'V': /* Does not return. */ diff -Nru bind9-9.20.15/bin/dnssec/dnssec-ksr.c bind9-9.20.18/bin/dnssec/dnssec-ksr.c --- bind9-9.20.15/bin/dnssec/dnssec-ksr.c 2025-10-18 10:16:12.253727485 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-ksr.c 2026-01-09 13:39:27.949968727 +0000 @@ -97,23 +97,15 @@ #define READLINE(lex, opt, token) -#define NEXTTOKEN(lex, opt, token) \ - { \ - ret = isc_lex_gettoken(lex, opt, token); \ - if (ret != ISC_R_SUCCESS) \ - goto cleanup; \ - } - -#define BADTOKEN() \ - { \ - ret = ISC_R_UNEXPECTEDTOKEN; \ - goto cleanup; \ - } - -#define CHECK(r) \ - ret = (r); \ - if (ret != ISC_R_SUCCESS) { \ - goto fail; \ +#define NEXTTOKEN(lex, opt, token) \ + { \ + CHECK(isc_lex_gettoken(lex, opt, token)); \ + } + +#define BADTOKEN() \ + { \ + result = ISC_R_UNEXPECTEDTOKEN; \ + goto cleanup; \ } isc_bufferlist_t cleanup_list = ISC_LIST_INITIALIZER; @@ -219,15 +211,15 @@ dns_dnsseckeylist_t keys_read; dns_dnsseckey_t **keys_sorted; int i = 0, n = 0; - isc_result_t ret; + isc_result_t result; ISC_LIST_INIT(*keys); ISC_LIST_INIT(keys_read); - ret = dns_dnssec_findmatchingkeys(name, NULL, ksr->keydir, NULL, - ksr->now, mctx, &keys_read); - if (ret != ISC_R_SUCCESS && ret != ISC_R_NOTFOUND) { + result = dns_dnssec_findmatchingkeys(name, NULL, ksr->keydir, NULL, + ksr->now, false, mctx, &keys_read); + if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND) { fatal("failed to load existing keys from %s: %s", ksr->keydir, - isc_result_totext(ret)); + isc_result_totext(result)); } /* Sort on keytag. */ for (dns_dnsseckey_t *dk = ISC_LIST_HEAD(keys_read); dk != NULL; @@ -344,7 +336,7 @@ dst_key_t *key = NULL; int options = (DST_TYPE_PRIVATE | DST_TYPE_PUBLIC | DST_TYPE_STATE); isc_buffer_t buf; - isc_result_t ret; + isc_result_t result; isc_stdtime_t prepub; uint16_t flags = DNS_KEYOWNER_ZONE; @@ -442,26 +434,26 @@ "Generating key pair for bundle %s: ", timestr); } if (ksr->keystore != NULL && ksr->policy != NULL) { - ret = dns_keystore_keygen( + result = dns_keystore_keygen( ksr->keystore, name, ksr->policy, dns_rdataclass_in, mctx, ksr->alg, ksr->size, flags, &key); } else if (show_progress) { - ret = dst_key_generate(name, ksr->alg, ksr->size, 0, - flags, DNS_KEYPROTO_DNSSEC, - dns_rdataclass_in, NULL, mctx, - &key, &progress); + result = dst_key_generate(name, ksr->alg, ksr->size, 0, + flags, DNS_KEYPROTO_DNSSEC, + dns_rdataclass_in, NULL, mctx, + &key, &progress); fflush(stderr); } else { - ret = dst_key_generate(name, ksr->alg, ksr->size, 0, - flags, DNS_KEYPROTO_DNSSEC, - dns_rdataclass_in, NULL, mctx, - &key, NULL); + result = dst_key_generate(name, ksr->alg, ksr->size, 0, + flags, DNS_KEYPROTO_DNSSEC, + dns_rdataclass_in, NULL, mctx, + &key, NULL); } - if (ret != ISC_R_SUCCESS) { + if (result != ISC_R_SUCCESS) { fatal("failed to generate key %s/%s: %s\n", namestr, - algstr, isc_result_totext(ret)); + algstr, isc_result_totext(result)); } /* Do not overwrite an existing key. */ @@ -472,9 +464,9 @@ conflict = true; if (verbose > 0) { isc_buffer_clear(&buf); - ret = dst_key_buildfilename(key, 0, ksr->keydir, - &buf); - if (ret == ISC_R_SUCCESS) { + result = dst_key_buildfilename( + key, 0, ksr->keydir, &buf); + if (result == ISC_R_SUCCESS) { fprintf(stderr, "%s: %s already exists, or " "might collide with another " @@ -522,20 +514,20 @@ *expiration = 0; } - ret = dst_key_tofile(key, options, ksr->keydir); - if (ret != ISC_R_SUCCESS) { + result = dst_key_tofile(key, options, ksr->keydir); + if (result != ISC_R_SUCCESS) { char keystr[DST_KEY_FORMATSIZE]; dst_key_format(key, keystr, sizeof(keystr)); fatal("failed to write key %s: %s\n", keystr, - isc_result_totext(ret)); + isc_result_totext(result)); } output: isc_buffer_clear(&buf); - ret = dst_key_buildfilename(key, 0, NULL, &buf); - if (ret != ISC_R_SUCCESS) { + result = dst_key_buildfilename(key, 0, NULL, &buf); + if (result != ISC_R_SUCCESS) { fatal("dst_key_buildfilename returned: %s\n", - isc_result_totext(ret)); + isc_result_totext(result)); } printf("%s\n", filename); fflush(stdout); @@ -548,12 +540,12 @@ print_rdata(dns_rdataset_t *rrset) { isc_buffer_t target; isc_region_t r; - isc_result_t ret; + isc_result_t result; char buf[4096]; isc_buffer_init(&target, buf, sizeof(buf)); - ret = dns_rdataset_totext(rrset, name, false, false, &target); - if (ret != ISC_R_SUCCESS) { + result = dns_rdataset_totext(rrset, name, false, false, &target); + if (result != ISC_R_SUCCESS) { fatal("failed to print rdata"); } isc_buffer_usedregion(&target, &r); @@ -567,7 +559,7 @@ char timestr[26]; /* Minimal buf as per ctime_r() spec. */ dns_rdatalist_t *rdatalist = NULL; dns_rdataset_t rdataset = DNS_RDATASET_INIT; - isc_result_t ret = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; isc_stdtime_t next_bundle = next_inception; isc_stdtime_tostring(inception, timestr, sizeof(timestr)); @@ -636,11 +628,11 @@ dns_rdatalist_tordataset(rdatalist, &rdataset); print_rdata(&rdataset); -fail: +cleanup: /* Cleanup */ freerrset(&rdataset); - if (ret != ISC_R_SUCCESS) { + if (result != ISC_R_SUCCESS) { fatal("failed to print %s/%s zsk key pair found for bundle %s", namestr, algstr, timestr); } @@ -653,7 +645,7 @@ dns_rdataset_t *rrset, dns_dnsseckeylist_t *keys) { dns_rdatalist_t *rrsiglist = NULL; dns_rdataset_t rrsigset = DNS_RDATASET_INIT; - isc_result_t ret; + isc_result_t result; isc_stdtime_t next_bundle = expiration; UNUSED(ksr); @@ -668,10 +660,10 @@ isc_buffer_init(&timebuf, timestr, sizeof(timestr)); isc_stdtime_tostring(inception, timestr, sizeof(timestr)); isc_buffer_init(&b, utc, sizeof(utc)); - ret = dns_time32_totext(inception, &b); - if (ret != ISC_R_SUCCESS) { + result = dns_time32_totext(inception, &b); + if (result != ISC_R_SUCCESS) { fatal("failed to convert bundle time32 to text: %s", - isc_result_totext(ret)); + isc_result_totext(result)); } isc_buffer_usedregion(&b, &r); fprintf(stdout, ";; SignedKeyResponse 1.0 %.*s (%s)\n", @@ -720,9 +712,9 @@ rrsig = isc_mem_get(mctx, sizeof(*rrsig)); dns_rdata_init(rrsig); isc_buffer_init(&buf, rdatabuf, sizeof(rdatabuf)); - ret = dns_dnssec_sign(name, rrset, dk->key, &clockskew, - &expiration, mctx, &buf, &rdata); - if (ret != ISC_R_SUCCESS) { + result = dns_dnssec_sign(name, rrset, dk->key, &clockskew, + &expiration, mctx, &buf, &rdata); + if (result != ISC_R_SUCCESS) { fatal("failed to sign KSR"); } isc_buffer_usedregion(&buf, &rs); @@ -755,7 +747,7 @@ dns_rdatalist_t *dnskeylist = isc_mem_get(mctx, sizeof(*dnskeylist)); dns_rdatalist_t *cdnskeylist = isc_mem_get(mctx, sizeof(*cdnskeylist)); dns_rdatalist_t *cdslist = isc_mem_get(mctx, sizeof(*cdslist)); - isc_result_t ret = ISC_R_SUCCESS; + isc_result_t result = ISC_R_SUCCESS; isc_stdtime_t next_bundle = next_inception; dns_rdatalist_init(dnskeylist); @@ -899,7 +891,7 @@ return next_bundle; -fail: +cleanup: fatal("failed to create KSK/CDS/CDNSKEY"); return 0; } @@ -996,7 +988,7 @@ dns_name_t *dname = NULL; dns_rdataclass_t rdclass = dns_rdataclass_in; isc_buffer_t b; - isc_result_t ret; + isc_result_t result; isc_token_t token; unsigned int opt = ISC_LEXOPT_EOL; @@ -1010,12 +1002,12 @@ dname = dns_fixedname_initname(&dfname); isc_buffer_init(&b, owner, strlen(owner)); isc_buffer_add(&b, strlen(owner)); - ret = dns_name_fromtext(dname, &b, dns_rootname, 0, NULL); - if (ret != ISC_R_SUCCESS) { - return ret; + result = dns_name_fromtext(dname, &b, dns_rootname, 0, NULL); + if (result != ISC_R_SUCCESS) { + goto cleanup; } if (dns_name_compare(dname, name) != 0) { - return DNS_R_BADOWNERNAME; + CHECK(DNS_R_BADOWNERNAME); } isc_buffer_clear(&b); @@ -1026,8 +1018,8 @@ } /* If it's a TTL, read the next one */ - ret = dns_ttl_fromtext(&token.value.as_textregion, ttl); - if (ret == ISC_R_SUCCESS) { + result = dns_ttl_fromtext(&token.value.as_textregion, ttl); + if (result == ISC_R_SUCCESS) { NEXTTOKEN(lex, opt, &token); } if (token.type != isc_tokentype_string) { @@ -1035,8 +1027,8 @@ } /* If it's a class, read the next one */ - ret = dns_rdataclass_fromtext(&rdclass, &token.value.as_textregion); - if (ret == ISC_R_SUCCESS) { + result = dns_rdataclass_fromtext(&rdclass, &token.value.as_textregion); + if (result == ISC_R_SUCCESS) { NEXTTOKEN(lex, opt, &token); } if (token.type != isc_tokentype_string) { @@ -1048,12 +1040,12 @@ BADTOKEN(); } - ret = dns_rdata_fromtext(NULL, rdclass, dns_rdatatype_dnskey, lex, name, - 0, mctx, buf, NULL); + result = dns_rdata_fromtext(NULL, rdclass, dns_rdatatype_dnskey, lex, + name, 0, mctx, buf, NULL); cleanup: isc_lex_setcomments(lex, 0); - return ret; + return result; } static void @@ -1126,14 +1118,14 @@ char utc[sizeof("YYYYMMDDHHSSMM")]; isc_buffer_t b; isc_region_t r; - isc_result_t ret; + isc_result_t result; isc_stdtime_tostring(inception, timestr, sizeof(timestr)); isc_buffer_init(&b, utc, sizeof(utc)); - ret = dns_time32_totext(inception, &b); - if (ret != ISC_R_SUCCESS) { + result = dns_time32_totext(inception, &b); + if (result != ISC_R_SUCCESS) { fatal("failed to convert bundle time32 to text: %s", - isc_result_totext(ret)); + isc_result_totext(result)); } isc_buffer_usedregion(&b, &r); fprintf(stdout, ";; KeySigningRequest 1.0 %.*s (%s)\n", @@ -1177,7 +1169,7 @@ dns_dnsseckeylist_t keys; dns_kasp_t *kasp = NULL; dns_rdatalist_t *rdatalist = NULL; - isc_result_t ret; + isc_result_t result; isc_stdtime_t inception; isc_lex_t *lex = NULL; isc_lexspecials_t specials; @@ -1203,14 +1195,15 @@ specials[')'] = 1; specials['"'] = 1; isc_lex_setspecials(lex, specials); - ret = isc_lex_openfile(lex, ksr->file); - if (ret != ISC_R_SUCCESS) { + result = isc_lex_openfile(lex, ksr->file); + if (result != ISC_R_SUCCESS) { fatal("unable to open KSR file %s: %s", ksr->file, - isc_result_totext(ret)); + isc_result_totext(result)); } - for (ret = isc_lex_gettoken(lex, opt, &token); ret == ISC_R_SUCCESS; - ret = isc_lex_gettoken(lex, opt, &token)) + for (result = isc_lex_gettoken(lex, opt, &token); + result == ISC_R_SUCCESS; + result = isc_lex_gettoken(lex, opt, &token)) { if (token.type != isc_tokentype_string) { fatal("bad KSR file %s(%lu): syntax error", ksr->file, @@ -1276,13 +1269,13 @@ readline: /* Read remainder of header line */ do { - ret = isc_lex_gettoken(lex, opt, &token); - if (ret != ISC_R_SUCCESS) { + result = isc_lex_gettoken(lex, opt, &token); + if (result != ISC_R_SUCCESS) { fatal("bad KSR file %s(%lu): bad " "header (%s)", ksr->file, isc_lex_getsourceline(lex), - isc_result_totext(ret)); + isc_result_totext(result)); } } while (token.type != isc_tokentype_eol); } else { @@ -1299,11 +1292,11 @@ rdata = isc_mem_get(mctx, sizeof(*rdata)); dns_rdata_init(rdata); isc_buffer_init(&buf, rdatabuf, sizeof(rdatabuf)); - ret = parse_dnskey(lex, STR(token), &buf, &ttl); - if (ret != ISC_R_SUCCESS) { + result = parse_dnskey(lex, STR(token), &buf, &ttl); + if (result != ISC_R_SUCCESS) { fatal("bad KSR file %s(%lu): bad DNSKEY (%s)", ksr->file, isc_lex_getsourceline(lex), - isc_result_totext(ret)); + isc_result_totext(result)); } isc_buffer_usedregion(&buf, &r); isc_buffer_allocate(mctx, &newbuf, r.length); @@ -1321,7 +1314,7 @@ } } - if (ret != ISC_R_EOF) { + if (result != ISC_R_EOF) { fatal("bad KSR file %s(%lu): trailing garbage data", ksr->file, isc_lex_getsourceline(lex)); } @@ -1339,14 +1332,14 @@ fprintf(stdout, ";; SignedKeyResponse 1.0 generated at %s by %s\n", timestr, PACKAGE_VERSION); -fail: +cleanup: isc_lex_destroy(&lex); cleanup(&keys, kasp); } int main(int argc, char *argv[]) { - isc_result_t ret; + isc_result_t result; isc_buffer_t buf; int ch; char *endp; @@ -1387,10 +1380,10 @@ break; case 'K': ksr.keydir = isc_commandline_argument; - ret = try_dir(ksr.keydir); - if (ret != ISC_R_SUCCESS) { + result = try_dir(ksr.keydir); + if (result != ISC_R_SUCCESS) { fatal("cannot open directory %s: %s", - ksr.keydir, isc_result_totext(ret)); + ksr.keydir, isc_result_totext(result)); } break; case 'k': @@ -1423,9 +1416,10 @@ fatal("must provide a command and zone name"); } - ret = dst_lib_init(mctx, engine); - if (ret != ISC_R_SUCCESS) { - fatal("could not initialize dst: %s", isc_result_totext(ret)); + result = dst_lib_init(mctx, engine); + if (result != ISC_R_SUCCESS) { + fatal("could not initialize dst: %s", + isc_result_totext(result)); } /* @@ -1462,10 +1456,10 @@ name = dns_fixedname_initname(&fname); isc_buffer_init(&buf, argv[1], strlen(argv[1])); isc_buffer_add(&buf, strlen(argv[1])); - ret = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL); - if (ret != ISC_R_SUCCESS) { + result = dns_name_fromtext(name, &buf, dns_rootname, 0, NULL); + if (result != ISC_R_SUCCESS) { fatal("invalid zone name %s: %s", argv[1], - isc_result_totext(ret)); + isc_result_totext(result)); } /* command */ diff -Nru bind9-9.20.15/bin/dnssec/dnssec-revoke.c bind9-9.20.18/bin/dnssec/dnssec-revoke.c --- bind9-9.20.15/bin/dnssec/dnssec-revoke.c 2025-10-18 10:16:12.254727501 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-revoke.c 2026-01-09 13:39:27.949968727 +0000 @@ -39,10 +39,10 @@ static isc_mem_t *mctx = NULL; noreturn static void -usage(void); +usage(int ret); static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s [options] keyfile\n\n", program); fprintf(stderr, "Version: %s\n", PACKAGE_VERSION); @@ -58,7 +58,7 @@ fprintf(stderr, " K++.key, " "K++.private\n"); - exit(EXIT_FAILURE); + exit(ret); } int @@ -79,7 +79,7 @@ bool id = false; if (argc == 1) { - usage(); + usage(EXIT_FAILURE); } isc_mem_create(&mctx); @@ -118,10 +118,12 @@ fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); } - FALLTHROUGH; + /* Does not return. */ + usage(EXIT_FAILURE); + case 'h': /* Does not return. */ - usage(); + usage(EXIT_SUCCESS); case 'V': /* Does not return. */ diff -Nru bind9-9.20.15/bin/dnssec/dnssec-settime.c bind9-9.20.18/bin/dnssec/dnssec-settime.c --- bind9-9.20.15/bin/dnssec/dnssec-settime.c 2025-10-18 10:16:12.254727501 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-settime.c 2026-01-09 13:39:27.950968753 +0000 @@ -43,10 +43,10 @@ static isc_mem_t *mctx = NULL; noreturn static void -usage(void); +usage(int ret); static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage:\n"); fprintf(stderr, " %s [options] keyfile\n\n", program); fprintf(stderr, "Version: %s\n", PACKAGE_VERSION); @@ -101,7 +101,7 @@ fprintf(stderr, " K++.key, " "K++.private\n"); - exit(EXIT_FAILURE); + exit(ret); } static void @@ -242,7 +242,7 @@ options = DST_TYPE_PUBLIC | DST_TYPE_PRIVATE | DST_TYPE_STATE; if (argc == 1) { - usage(); + usage(EXIT_FAILURE); } isc_mem_create(&mctx); @@ -339,10 +339,13 @@ fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); } - FALLTHROUGH; + /* Does not return. */ + usage(EXIT_FAILURE); + case 'h': /* Does not return. */ - usage(); + usage(EXIT_SUCCESS); + case 'I': if (setinact || unsetinact) { fatal("-I specified more than once"); @@ -476,7 +479,7 @@ case ' ': break; default: - usage(); + usage(EXIT_FAILURE); break; } } while (*p != '\0'); diff -Nru bind9-9.20.15/bin/dnssec/dnssec-signzone.c bind9-9.20.18/bin/dnssec/dnssec-signzone.c --- bind9-9.20.15/bin/dnssec/dnssec-signzone.c 2025-10-18 10:16:12.254727501 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-signzone.c 2026-01-09 13:39:27.950968753 +0000 @@ -2852,7 +2852,7 @@ * Find keys that match this zone in the key repository. */ result = dns_dnssec_findmatchingkeys(gorigin, NULL, directory, NULL, - now, mctx, &matchkeys); + now, false, mctx, &matchkeys); if (result == ISC_R_NOTFOUND) { result = ISC_R_SUCCESS; } @@ -3234,10 +3234,10 @@ } noreturn static void -usage(void); +usage(int ret); static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage:\n"); fprintf(stderr, "\t%s [options] zonefile [keys]\n", program); @@ -3325,7 +3325,7 @@ fprintf(stderr, "(default: all zone keys that have private keys)\n"); fprintf(stderr, "\tkeyfile (Kname+alg+tag)\n"); - exit(EXIT_FAILURE); + exit(ret); } static void @@ -3699,10 +3699,12 @@ fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); } - FALLTHROUGH; + /* Does not return. */ + usage(EXIT_FAILURE); + case 'h': /* Does not return. */ - usage(); + usage(EXIT_SUCCESS); case 'V': /* Does not return. */ @@ -3795,7 +3797,7 @@ argv += isc_commandline_index; if (argc < 1) { - usage(); + usage(EXIT_FAILURE); } file = argv[0]; diff -Nru bind9-9.20.15/bin/dnssec/dnssec-verify.c bind9-9.20.18/bin/dnssec/dnssec-verify.c --- bind9-9.20.15/bin/dnssec/dnssec-verify.c 2025-10-18 10:16:12.255727517 +0000 +++ bind9-9.20.18/bin/dnssec/dnssec-verify.c 2026-01-09 13:39:27.950968753 +0000 @@ -138,10 +138,10 @@ } noreturn static void -usage(void); +usage(int ret); static void -usage(void) { +usage(int ret) { fprintf(stderr, "Usage:\n"); fprintf(stderr, "\t%s [options] zonefile [keys]\n", program); @@ -163,7 +163,7 @@ fprintf(stderr, "\t-x:\tDNSKEY record signed with KSKs only, " "not ZSKs\n"); fprintf(stderr, "\t-z:\tAll records signed with KSKs\n"); - exit(EXIT_SUCCESS); + exit(ret); } int @@ -259,11 +259,12 @@ fprintf(stderr, "%s: invalid argument -%c\n", program, isc_commandline_option); } - FALLTHROUGH; + /* Does not return. */ + usage(EXIT_FAILURE); case 'h': /* Does not return. */ - usage(); + usage(EXIT_SUCCESS); case 'V': /* Does not return. */ @@ -292,7 +293,7 @@ argv += isc_commandline_index; if (argc < 1) { - usage(); + usage(EXIT_FAILURE); } file = argv[0]; diff -Nru bind9-9.20.15/bin/dnssec/dnssectool.c bind9-9.20.18/bin/dnssec/dnssectool.c --- bind9-9.20.15/bin/dnssec/dnssectool.c 2025-10-18 10:16:12.255727517 +0000 +++ bind9-9.20.18/bin/dnssec/dnssectool.c 2026-01-09 13:39:27.951968779 +0000 @@ -511,10 +511,17 @@ } ISC_LIST_INIT(matchkeys); - result = dns_dnssec_findmatchingkeys(name, NULL, dir, NULL, now, mctx, - &matchkeys); + bool keykey = false; + + /* + * DNSKEY and KEY both use the same file names patterns so + * we have to look for both sets of keys. + */ +again: + result = dns_dnssec_findmatchingkeys(name, NULL, dir, NULL, now, keykey, + mctx, &matchkeys); if (result == ISC_R_NOTFOUND) { - return false; + goto try_key; } while (!ISC_LIST_EMPTY(matchkeys) && !conflict) { @@ -558,17 +565,22 @@ dns_dnsseckey_destroy(mctx, &key); } +try_key: + if (!conflict && !keykey) { + keykey = true; + goto again; + } return conflict; } bool -isoptarg(const char *arg, char **argv, void (*usage)(void)) { +isoptarg(const char *arg, char **argv, void (*usage)(int ret)) { if (!strcasecmp(isc_commandline_argument, arg)) { if (argv[isc_commandline_index] == NULL) { fprintf(stderr, "%s: missing argument -%c %s\n", program, isc_commandline_option, isc_commandline_argument); - usage(); + usage(EXIT_FAILURE); } isc_commandline_argument = argv[isc_commandline_index]; /* skip to next argument */ diff -Nru bind9-9.20.15/bin/dnssec/dnssectool.h bind9-9.20.18/bin/dnssec/dnssectool.h --- bind9-9.20.15/bin/dnssec/dnssectool.h 2025-10-18 10:16:12.255727517 +0000 +++ bind9-9.20.18/bin/dnssec/dnssectool.h 2026-01-09 13:39:27.951968779 +0000 @@ -108,11 +108,11 @@ set_keyversion(dst_key_t *key); bool -key_collision(dst_key_t *key, dns_name_t *name, const char *dir, +key_collision(dst_key_t *dstkey, dns_name_t *name, const char *dir, isc_mem_t *mctx, uint16_t min, uint16_t max, bool *exact); bool -isoptarg(const char *arg, char **argv, void (*usage)(void)); +isoptarg(const char *arg, char **argv, void (*usage)(int ret)); void loadjournal(isc_mem_t *mctx, dns_db_t *db, const char *journal); diff -Nru bind9-9.20.15/bin/named/Makefile.in bind9-9.20.18/bin/named/Makefile.in --- bind9-9.20.15/bin/named/Makefile.in 2025-10-18 10:17:04.058495088 +0000 +++ bind9-9.20.18/bin/named/Makefile.in 2026-01-09 13:40:25.952488641 +0000 @@ -318,6 +318,7 @@ JEMALLOC_CFLAGS = @JEMALLOC_CFLAGS@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JEMALLOC_VERSION = @JEMALLOC_VERSION@ +JQ = @JQ@ JSON_C_CFLAGS = @JSON_C_CFLAGS@ JSON_C_LIBS = @JSON_C_LIBS@ KRB5_CFLAGS = @KRB5_CFLAGS@ @@ -404,6 +405,7 @@ STRIP = @STRIP@ TEST_CFLAGS = @TEST_CFLAGS@ VERSION = @VERSION@ +XMLLINT = @XMLLINT@ XSLTPROC = @XSLTPROC@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru bind9-9.20.15/bin/named/bind9.xsl bind9-9.20.18/bin/named/bind9.xsl --- bind9-9.20.15/bin/named/bind9.xsl 2025-10-18 10:16:12.255727517 +0000 +++ bind9-9.20.18/bin/named/bind9.xsl 2026-01-09 13:39:27.951968779 +0000 @@ -35,64 +35,61 @@ }); - - - - - // Server Incoming Requests by opcode - graphs.push({ - 'title' : "Server Incoming Requests by DNS Opcode", - 'target': 'chart_incoming_opcodes', - 'style': 'barchart', - 'data': [['Opcode','Counter'],['',],]}); - - -