Add a ZSK to secure-delegated test zone properly

Don't rely on the output of pdnsutil for this

Closes #3591

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index a13520cdece7401b7f9680df5bc2cbdec59bcaaa..437fb644f9ae152c0cc6fe2d54ed38cfc8099f96 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -76,9 +76,7 @@ securezone ()
        if [ "${zone: 0:16}" = "secure-delegated" ]
        then
                $PDNSUTIL --config-dir=. $configname import-zone-key $zone $zone.private ksk 2>&1
-               $PDNSUTIL --config-dir=. $configname add-zone-key $zone 1024 zsk 2>&1
-               keyid=`$PDNSUTIL --config-dir=. $configname show-zone $zone | grep ZSK | cut -d' ' -f3`
-               $PDNSUTIL --config-dir=. $configname activate-zone-key $zone $keyid 2>&1
+               $PDNSUTIL --config-dir=. $configname add-zone-key $zone 1024 zsk active 2>&1
                $PDNSUTIL --config-dir=. $configname rectify-zone $zone 2>&1
                $PDNSUTIL --config-dir=. $configname set-publish-cds $zone 2>&1
                $PDNSUTIL --config-dir=. $configname set-publish-cdnskey $zone 2>&1