From: Mark Andrews <marka@isc.org>
Date: Thu, 12 Jan 2017 02:59:10 +0000 (+1100)
Subject: remove false positives due to bad grep [RT #44178]
X-Git-Tag: v9.12.0a1~538
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=0c43d50368aea40bb4152cb4a6c2b3d1d88713fa;p=thirdparty%2Fbind9.git

remove false positives due to bad grep [RT #44178]
---

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index e6b36410524..613b50271f6 100644
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -3251,7 +3251,7 @@ $KEYGEN -q -r $RANDFILE -3 remove > /dev/null
 echo > remove.db.signed
 $SIGNER -S -o remove -D -f remove.db.signed remove.db.in > signer.out.1.$n 2>&1
 )
-grep -w MX signer/remove.db.signed > /dev/null || {
+grep "RRSIG MX" signer/remove.db.signed > /dev/null || {
 	ret=1 ; cp signer/remove.db.signed signer/remove.db.signed.pre$n;
 }
 # re-generate signed zone without MX and AAAA records at apex.
@@ -3259,7 +3259,7 @@ grep -w MX signer/remove.db.signed > /dev/null || {
 cd signer
 $SIGNER -S -o remove -D -f remove.db.signed remove2.db.in > signer.out.2.$n 2>&1
 )
-grep -w MX signer/remove.db.signed > /dev/null &&  {
+grep "RRSIG MX" signer/remove.db.signed > /dev/null &&  {
 	ret=1 ; cp signer/remove.db.signed signer/remove.db.signed.post$n;
 }
 n=`expr $n + 1`
@@ -3274,7 +3274,7 @@ cd signer
 echo > remove.db.signed
 $SIGNER -3 - -S -o remove -D -f remove.db.signed remove.db.in > signer.out.1.$n 2>&1
 )
-grep -w MX signer/remove.db.signed > /dev/null || {
+grep "RRSIG MX" signer/remove.db.signed > /dev/null || {
 	ret=1 ; cp signer/remove.db.signed signer/remove.db.signed.pre$n;
 }
 # re-generate signed zone without MX and AAAA records at apex.
@@ -3282,7 +3282,7 @@ grep -w MX signer/remove.db.signed > /dev/null || {
 cd signer
 $SIGNER -3 - -S -o remove -D -f remove.db.signed remove2.db.in > signer.out.2.$n 2>&1
 )
-grep -w MX signer/remove.db.signed > /dev/null &&  {
+grep "RRSIG MX" signer/remove.db.signed > /dev/null &&  {
 	ret=1 ; cp signer/remove.db.signed signer/remove.db.signed.post$n;
 }
 n=`expr $n + 1`