From: Evan Hunt Date: Sun, 16 Feb 2014 22:14:56 +0000 (-0800) Subject: [master] fix dnssec test errors X-Git-Tag: v9.10.0b1~104 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=7ba88e2a9503b5b2efad9d124dc093ea2b405b3c;p=thirdparty%2Fbind9.git [master] fix dnssec test errors --- diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index e41aeec26d8..81d2b2b88c7 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -822,7 +822,7 @@ if [ -x ${RESOLVE} ] ; then ret=0 echo "I:checking failed validation using dns_client ($n)" $RESOLVE $RESKEY -p 5300 -t a -s 10.53.0.4 a.bogus.example > /dev/null 2> resolve.out$n || ret=1 - grep "resolution failed: no valid RRSIG" resolve.out$n > /dev/null || ret=1 + grep "resolution failed: RRSIG failed to verify" resolve.out$n > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` @@ -1730,7 +1730,7 @@ ret=0 $DIG $DIGOPTS +noauth expired.example. +dnssec @10.53.0.4 soa > dig.out.ns4.test$n || ret=1 grep "SERVFAIL" dig.out.ns4.test$n > /dev/null || ret=1 grep "flags:.*ad.*QUERY" dig.out.ns4.test$n > /dev/null && ret=1 -grep "expired.example .*: RRSIG has expired" ns4/named.run > /dev/null || ret=1 +grep "expired.example/.*: RRSIG has expired" ns4/named.run > /dev/null || ret=1 n=`expr $n + 1` if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret`