From: Matthijs Mekking Date: Wed, 23 Jun 2021 09:17:02 +0000 (+0200) Subject: Add configuration that causes setnsec3param hang X-Git-Tag: v9.17.16~10^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3631a23c7fb547ff30708dfb77398bfba100faa4;p=thirdparty%2Fbind9.git Add configuration that causes setnsec3param hang Add a zone to the configuration file that uses NSEC3 with dnssec-policy and fails to load. This will cause setnsec3param to go into a busy wait and will cause a hang on shutdown. --- diff --git a/bin/tests/system/nsec3/ns3/named2.conf.in b/bin/tests/system/nsec3/ns3/named2.conf.in index ece15493951..5c1094e276c 100644 --- a/bin/tests/system/nsec3/ns3/named2.conf.in +++ b/bin/tests/system/nsec3/ns3/named2.conf.in @@ -117,3 +117,11 @@ zone "nsec3-to-nsec.kasp" { //dnssec-policy "nsec3"; dnssec-policy "nsec"; }; + +/* Add a zone that fails to load, should not prevent shutdown. */ +zone "nsec3-fails-to-load.kasp" { + type primary; + file "nsec3-fails-to-load.kasp.db"; + dnssec-policy "nsec3"; + allow-update { any; }; +}; diff --git a/bin/tests/system/nsec3/ns3/nsec3-fails-to-load.kasp.db.in b/bin/tests/system/nsec3/ns3/nsec3-fails-to-load.kasp.db.in new file mode 100644 index 00000000000..5703d810d3a --- /dev/null +++ b/bin/tests/system/nsec3/ns3/nsec3-fails-to-load.kasp.db.in @@ -0,0 +1,8 @@ +@ IN SOA kasp. nsec3-fails-to-load.kasp. ( + 1 ; serial + 30 ; refresh (30 seconds) + 10 ; retry (10 seconds) + 3600000 ; expire (5 weeks 6 days 16 hours) + 300 ; minimum (5 minutes) + ) + NS nsec3-fails-to-load.kasp. diff --git a/bin/tests/system/nsec3/ns3/setup.sh b/bin/tests/system/nsec3/ns3/setup.sh index 4b529d33d99..ffedec558fb 100644 --- a/bin/tests/system/nsec3/ns3/setup.sh +++ b/bin/tests/system/nsec3/ns3/setup.sh @@ -27,3 +27,5 @@ for zn in nsec-to-nsec3 nsec3 nsec3-other nsec3-change nsec3-to-nsec \ do setup "${zn}.kasp" done + +cp nsec3-fails-to-load.kasp.db.in nsec3-fails-to-load.kasp.db