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

(cherry picked from commit 0c43d50368)
This commit is contained in:
Mark Andrews 2017-01-12 13:59:10 +11:00
parent 468345fe9b
commit d8c69ae14f

View file

@ -2698,7 +2698,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.
@ -2706,7 +2706,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`
@ -2721,7 +2721,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.
@ -2729,7 +2729,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`