From: Matthijs Mekking <matthijs@isc.org>
Date: Mon, 16 Oct 2023 09:08:59 +0000 (+0200)
Subject: Two minor fixes in the kasp system test
X-Git-Tag: v9.19.18~39^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=21d04f556d0ba0fb8d4e2b797fbca754fbec5bbd;p=thirdparty%2Fbind9.git

Two minor fixes in the kasp system test

The 'dynamic-signed-inline-signing.kasp' zone was set up with
the environment variable 'ksktimes', but that should be 'csktimes'
which is set one line above. Since the values are currently the same
the behavior is identical, but of course it should use the correct
variable.

The 'step4.enable-dnssec.autosign' zone was set up twice. This is
unnecessary.
---

diff --git a/bin/tests/system/kasp/ns3/setup.sh b/bin/tests/system/kasp/ns3/setup.sh
index be8ad8c80f6..325fc4c67e4 100644
--- a/bin/tests/system/kasp/ns3/setup.sh
+++ b/bin/tests/system/kasp/ns3/setup.sh
@@ -171,7 +171,7 @@ $SIGNER -PS -x -o $zone -O raw -f "${zonefile}.signed" $infile > signer.out.$zon
 setup dynamic-signed-inline-signing.kasp
 T="now-1d"
 csktimes="-P $T -A $T -P sync $T"
-CSK=$($KEYGEN -a $DEFAULT_ALGORITHM -L 3600 -f KSK $ksktimes $zone 2> keygen.out.$zone.1)
+CSK=$($KEYGEN -a $DEFAULT_ALGORITHM -L 3600 -f KSK $csktimes $zone 2> keygen.out.$zone.1)
 $SETTIME -s -g $O -d $O $T -k $O $T -z $O $T -r $O $T "$CSK" > settime.out.$zone.1 2>&1
 cat template.db.in "${CSK}.key" > "$infile"
 cp $infile $zonefile
@@ -345,7 +345,6 @@ cat template.db.in "${CSK}.key" > "$infile"
 private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >> "$infile"
 cp $infile $zonefile
 $SIGNER -S -z -x -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile > signer.out.$zone.1 2>&1
-setup step4.enable-dnssec.autosign
 
 #
 # The zones at zsk-prepub.autosign represent the various steps of a ZSK