From 8093fe6956f42769a9f40c78cd4e7d46f5c2be1b Mon Sep 17 00:00:00 2001
From: Kees Monshouwer <mind04@monshouwer.org>
Date: Tue, 3 Sep 2013 01:28:30 +0200
Subject: [PATCH] fix ext-bind non dnssec

---
 regression-tests/start-test-stop         | 20 +++++++++++---------
 regression-tests/very-long-txt/skip.bind |  0
 2 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 regression-tests/very-long-txt/skip.bind

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index e2f6670185..934e92a3ad 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -82,6 +82,7 @@ tobind ()
 options {
 	dnssec-enable yes;
 	listen-on port $port { 127.0.0.1; };
+	minimal-responses yes;
 	pid-file "pdns.pid";
 };
 __EOF__
@@ -93,6 +94,12 @@ __EOF__
 
 	for zone in $(grep zone named.conf  | cut -f2 -d\")
 	do
+
+		if [ ! -f $zone.bind ]
+		then
+			cp $zone $zone.bind
+		fi
+
 		if [ "$1" != "unsigned" ]
 		then
 			if [ ! "${zone: 0:16}" = "secure-delegated" ]
@@ -104,16 +111,11 @@ __EOF__
 				ksk="Ksecure-delegated.dnssec-parent.com.+008+54319"
 			fi
 			zsk=$(dnssec-keygen -r/dev/urandom -a RSASHA256 -b 1024 -n ZONE $zone)
-		fi
 
-		if [ ! -f $zone.bind ]
-		then
-			cp $zone $zone.bind
+			echo "\$include $ksk.key ; KSK" >> $zone.bind
+			echo "\$include $zsk.key ; ZSK" >> $zone.bind
 		fi
 
-		echo "\$include $ksk.key ; KSK" >> $zone.bind
-		echo "\$include $zsk.key ; ZSK" >> $zone.bind
-
 		case $1 in
 			nsec)
 				dnssec-signzone -o $zone -f $zone.signed $zone.bind
@@ -129,12 +131,13 @@ __EOF__
 				fi
 				;;
 			unsigned)
-				cp ${zonefile} ${zone}.signed
+				cp ${zone}.bind ${zone}.signed
 				;;
 			*)
 				echo 'tonsd called with wrong param'
 				exit 1
 		esac
+
 		echo "" >> bind.conf
 		echo "zone \"${zone}\" {" >> bind.conf
 		echo "	type master;" >> bind.conf
@@ -1018,7 +1021,6 @@ rm pdns*.pid || true
 
 if [ -s "./failed_tests" ]
 then
-	set +x
 	for t in `cat failed_tests`
 	do
 		echo -e "\n\n$t"
diff --git a/regression-tests/very-long-txt/skip.bind b/regression-tests/very-long-txt/skip.bind
new file mode 100644
index 0000000000..e69de29bb2
-- 
2.47.3