From: Curtis Blackburn <ckb@isc.org>
Date: Fri, 14 Dec 2018 04:20:02 +0000 (-0800)
Subject: minor fixes to dns64 and rndc CRLF fix. rpzrecurse failure
X-Git-Tag: v9.13.6~98^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=2ec746dafe7aed44b07f2abf4b640ca1d614a4c2;p=thirdparty%2Fbind9.git

minor fixes to dns64 and rndc CRLF fix. rpzrecurse failure
will be addressed in a separate issue
---

diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh
index cb37ddae36f..86ab4a4463c 100644
--- a/bin/tests/system/dns64/tests.sh
+++ b/bin/tests/system/dns64/tests.sh
@@ -1278,7 +1278,7 @@ status=`expr $status + $ret`
 echo_i "checking reverse mapping ($n)"
 ret=0
 $DIG $DIGOPTS -x 2001:aaaa::10.0.0.1 @10.53.0.2 > dig.out.ns2.test$n || ret=1
-tr -d '\r' < dig.out.ns2$n | grep -i "CNAME.1.0.0.10.IN-ADDR.ARPA.$" > /dev/null || ret=1
+tr -d '\r' < dig.out.ns2.test$n | grep -i "CNAME.1.0.0.10.IN-ADDR.ARPA.$" > /dev/null || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index ed98b1a587d..909ff778144 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -229,7 +229,7 @@ do
 done
 serial=`awk '$3 == "serial" {print $1}' ns2/other.db`
 newserial=`expr $serial + 1`
-sed s/$serial/$newserial/ ns2/other.db > ns2/other.db.new
+sed "s/$serial/$newserial/" ns2/other.db > ns2/other.db.new
 echo 'frozen TXT "frozen addition"' >> ns2/other.db.new
 mv -f ns2/other.db.new ns2/other.db
 $RNDCCMD 10.53.0.2 thaw 2>&1 | sed 's/^/ns2 /' | cat_i
@@ -272,7 +272,7 @@ do
 done
 serial=`awk '$3 == "serial" {print $1}' ns2/nil.db`
 newserial=`expr $serial + 1`
-sed s/$serial/$newserial/ ns2/nil.db > ns2/nil.db.new
+sed "s/$serial/$newserial/" ns2/nil.db > ns2/nil.db.new
 echo 'frozen TXT "frozen addition"' >> ns2/nil.db.new
 mv -f ns2/nil.db.new ns2/nil.db
 $RNDCCMD 10.53.0.2 thaw 2>&1 | sed 's/^/ns2 /' | cat_i