From: Kees Monshouwer <mind04@monshouwer.org>
Date: Tue, 3 Sep 2013 11:30:45 +0000 (+0200)
Subject: don't genereate keys for nsd in unsigned mode
X-Git-Tag: rec-3.6.0-rc1~458^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef4cfba8e9cbbac125b75ce22d9e49dcb2b0cf81;p=pdns

don't genereate keys for nsd in unsigned mode
---

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index 934e92a3a..89fa0218b 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -25,17 +25,14 @@ server:
 	username: ""
 __EOF__
 
-	nsdfix
 	rm -f K*
+	rm -f *.nsd
+
+	nsdfix
+
 	for zone in $(grep zone named.conf  | cut -f2 -d\")
 	do
-		if [ ! "${zone: 0:16}" = "secure-delegated" ]
-		then
-			ksk=$(ldns-keygen -r /dev/urandom -a RSASHA256 -k $zone)
-		else
-			ksk="secure-delegated.dnssec-parent.com"
-		fi
-		zsk=$(ldns-keygen -r /dev/urandom -a RSASHA256 $zone)
+
 		if [ -f $zone.nsd ]
 		then
 			zonefile=${zone}.nsd
@@ -43,6 +40,17 @@ __EOF__
 			zonefile=${zone}
 		fi
 
+		if [ "$1" != "unsigned" ]
+		then
+			if [ ! "${zone: 0:16}" = "secure-delegated" ]
+			then
+				ksk=$(ldns-keygen -r /dev/urandom -a RSASHA256 -k $zone)
+			else
+				ksk="secure-delegated.dnssec-parent.com"
+			fi
+			zsk=$(ldns-keygen -r /dev/urandom -a RSASHA256 $zone)
+		fi
+
 		case $1 in
 			nsec)
 				ldns-signzone -f ${zone}.signed ${zonefile} $ksk $zsk
@@ -64,6 +72,7 @@ __EOF__
 				echo 'tonsd called with wrong param'
 				exit 1
 		esac
+
 		echo "" >> nsd.conf
 		echo "zone:" >> nsd.conf
 		echo "  name: \"${zone}\"" >> nsd.conf
@@ -860,7 +869,7 @@ export optout
 if [ $presigned = yes ]
 then
         skipreasons="$skipreasons presigned nodyndns"
-	if [ ${context:0:6} = gmysql ] | [ ${context:0:7} = ext-nsd ] | [ ${context:0:8} = ext-bind ]
+	if [ ${context:0:6} = gmysql ] || [ ${context:0:7} = ext-nsd ] || [ ${context:0:8} = ext-bind ]
 	then
 		context=${context}-presigned
 		[ -z "$GMYSQL2DB" ] && GMYSQL2DB=pdnstest2