From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Wed, 21 Nov 2012 15:44:57 +0000 (+0000)
Subject: include full zone content on failing ldns-verify-zone; also canonicalize zone using... 
X-Git-Tag: auth-3.2-rc2~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dbde24a743cf06582fe509a972aeb94e7d6b2da;p=pdns

include full zone content on failing ldns-verify-zone; also canonicalize zone using ldns-read-zone to work around bugs in ldns-verify-zone

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2907 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/regression-tests/ldns-verify-zone/command b/regression-tests/ldns-verify-zone/command
index 8a206e6dd..5357a5161 100755
--- a/regression-tests/ldns-verify-zone/command
+++ b/regression-tests/ldns-verify-zone/command
@@ -3,9 +3,17 @@ ldns-verify-zone -h | head -n 1
 for zone in $(grep zone named.conf  | cut -f2 -d\" | grep -v '^example.com$')
 do
 	TFILE=$(mktemp)
-	dig axfr $zone @$nameserver -p $port > $TFILE
+	dig axfr $zone @$nameserver -p $port | ldns-read-zone > $TFILE
 	echo --- ldns-verify-zone $zone
 	ldns-verify-zone -V2 $TFILE 2>&1
-	echo RETVAL: $?
+	RETVAL=$?
+	echo RETVAL: $RETVAL
+	if [ $RETVAL -gt 0 ]
+	then
+		echo ldns-verify-zone reported error, full zone content:
+		echo ---
+		cat $TFILE
+		echo --- end of zone content
+	fi
 	rm -f $TFILE
 done