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

This commit is contained in:
Mark Andrews
2017-01-12 13:59:10 +11:00
parent 260ca42f96
commit 0c43d50368

View File

@@ -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`