From: Mark Andrews <marka@isc.org>
Date: Tue, 10 Jun 2014 02:28:33 +0000 (+1000)
Subject: update spf check
X-Git-Tag: v9.11.0a1~1562
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=32a1fd3dd27277717003d45af37f382956bb6783;p=thirdparty%2Fbind9.git

update spf check
---

diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh
index c9371d209db..e8b1bbad7c3 100644
--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@@ -58,12 +58,12 @@ echo "I:checking with spf warnings ($n)"
 ret=0
 $CHECKZONE example zones/spf.db > test.out1.$n 2>&1 || ret=1
 $CHECKZONE -T ignore example zones/spf.db > test.out2.$n 2>&1 || ret=1
-grep "'x.example' found SPF/TXT" test.out1.$n > /dev/null || ret=1
-grep "'y.example' found SPF/SPF" test.out1.$n > /dev/null || ret=1
-grep "'example' found SPF/" test.out1.$n > /dev/null && ret=1
-grep "'x.example' found SPF/" test.out2.$n > /dev/null && ret=1
-grep "'y.example' found SPF/" test.out2.$n > /dev/null && ret=1
-grep "'example' found SPF/" test.out2.$n > /dev/null && ret=1
+grep "'x.example' found type SPF" test.out1.$n > /dev/null && ret=1
+grep "'y.example' found type SPF" test.out1.$n > /dev/null || ret=1
+grep "'example' found type SPF" test.out1.$n > /dev/null && ret=1
+grep "'x.example' found type SPF" test.out2.$n > /dev/null && ret=1
+grep "'y.example' found type SPF" test.out2.$n > /dev/null && ret=1
+grep "'example' found type SPF" test.out2.$n > /dev/null && ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`