[rt46602] Miscellaneous changes to fix rebase issues

(cherry picked from commit 7222c9fc76)
2018-02-22 11:15:22 +00:00
parent 78f2976087
commit 3d4a425266
5 changed files with 15 additions and 1 deletions
@@ -2,6 +2,7 @@
 /ns2/named.conf.header
 /ns2/named.conf
 /ns3/named.conf
+/ns3/named2.conf
 /ns4/named.conf
 /ans5/ans.pl
 /ans5/ans.pid
@@ -19,6 +19,8 @@ rm -f ns2/*.queries
 rm -f ns2/named.[0-9]*.conf
 rm -f ns2/named.conf.header

+rm -f ns3/named2.conf
+
 rm -f ans4/ans.pl

 rm -f dnsrps*.conf dnsrpzd*
@@ -19,6 +19,15 @@ options {
 	querylog yes;
 };

+key rndc_key {
+	secret "1234abcd8765";
+	algorithm hmac-sha256;
+};
+
+controls {
+	inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+};
+
 zone "." {
 	type master;
 	file "root.db";
@@ -36,6 +36,7 @@ copy_setports ns2/named.conf.header.in ns2/named.conf.header
 copy_setports ns2/named.default.conf ns2/named.conf

 copy_setports ns3/named1.conf.in ns3/named.conf
+copy_setports ns3/named2.conf.in ns3/named2.conf

 copy_setports ns4/named.conf.in ns4/named.conf

@@ -47,7 +47,8 @@ run_server() {

    echo_i "starting resolver using named.$TESTNAME.conf"
    cp -f ns2/named.$TESTNAME.conf ns2/named.conf
-    $PERL $SYSTEMTESTTOP/start.pl --noclean --restart . ns2
+    $PERL $SYSTEMTESTTOP/start.pl --noclean --restart --port ${PORT} . ns2
+    sleep 3
 }

 run_query() {