[rt46602] Convert allow_query to dynamic port

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 2ff0b8e5d7f874d3e0b03ca2583e081959e815b5..16a5f6c96b1fae2547571997ba419891fa057c87 100644 (file)
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -45,11 +45,16 @@ feature-test@EXEEXT@: feature-test.@O@
 
 check: test
 
-test: subdirs
+TESTS = allow_query serve-stale
+
+test: subdirs $(TESTS)
        if test -f ./runall.sh; then $(SHELL) ./runall.sh; fi
 
-server-stale:
-       $(SHELL) ./run.sh -p 5310 -c 9954 server-stale
+serve-stale:
+       $(SHELL) ./run.sh -p 5304 -c 9954 $@
+
+allow_query:
+       $(SHELL) ./run.sh -p 5305 -c 9955 $@
 
 testclean clean distclean::
        if test -f ./cleanall.sh; then sh ./cleanall.sh; fi
@@ -67,4 +72,4 @@ install::
 
 uninstall::
 
-.PHONY: server-stale
+.PHONY: $(TESTS)

diff --git a/bin/tests/system/allow_query/clean.sh b/bin/tests/system/allow_query/clean.sh
index 64599ec80034fa0b862c215b8da8b8961c9eafb0..15c4ee833ad3f00e101d91366e0e47d672b469b8 100644 (file)
--- a/bin/tests/system/allow_query/clean.sh
+++ b/bin/tests/system/allow_query/clean.sh
@@ -13,7 +13,7 @@
 #
 
 rm -f dig.out.*
-rm -f ns2/named.conf
+rm -f ns2/named.conf ns2/named.port ns2/controls.conf
 rm -f */named.memstats
 rm -f ns*/named.lock
 rm -f ns*/named.run

diff --git a/bin/tests/system/allow_query/ns2/named01.conf b/bin/tests/system/allow_query/ns2/named01.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named01.conf
rename to bin/tests/system/allow_query/ns2/named01.conf.in
index 21bccd529b10c513212a77abecd88f36c424fd95..7c26a7296c41f480fcb2726da168344e54581d27 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named01.conf
+++ b/bin/tests/system/allow_query/ns2/named01.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named02.conf b/bin/tests/system/allow_query/ns2/named02.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named02.conf
rename to bin/tests/system/allow_query/ns2/named02.conf.in
index 86ac4a9f1b88546c89a373778184d5df7a38ea2c..80c14392070bf7c716ecda12f0ea81f7aed1ab57 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named02.conf
+++ b/bin/tests/system/allow_query/ns2/named02.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query { any; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named03.conf b/bin/tests/system/allow_query/ns2/named03.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named03.conf
rename to bin/tests/system/allow_query/ns2/named03.conf.in
index d28b6b0248af93f7b9dd731ee201e1fd50eba6b3..bc1f4ca27fd58f6c5ea0f74524064386e112dd4a 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named03.conf
+++ b/bin/tests/system/allow_query/ns2/named03.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query { none; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named04.conf b/bin/tests/system/allow_query/ns2/named04.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named04.conf
rename to bin/tests/system/allow_query/ns2/named04.conf.in
index b6bb5e935d08521949426a8953a4ce46d148e34e..66d04780a1ffc737758a979dba6d9e94cc2b5766 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named04.conf
+++ b/bin/tests/system/allow_query/ns2/named04.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query { 10.53.0.2; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named05.conf b/bin/tests/system/allow_query/ns2/named05.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named05.conf
rename to bin/tests/system/allow_query/ns2/named05.conf.in
index 8527bb870021f45dc3208f9d44eaa33c386fce01..4f26e6665e687344e5a86a613724a485e817a8dd 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named05.conf
+++ b/bin/tests/system/allow_query/ns2/named05.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query { 10.53.0.1; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named06.conf b/bin/tests/system/allow_query/ns2/named06.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named06.conf
rename to bin/tests/system/allow_query/ns2/named06.conf.in
index 91dd0a686b09110d95be4acf1313a207dad359fc..39f9979139c50321c675f92bf112d76ca1b7f7d3 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named06.conf
+++ b/bin/tests/system/allow_query/ns2/named06.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query {! 10.53.0.2; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named07.conf b/bin/tests/system/allow_query/ns2/named07.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named07.conf
rename to bin/tests/system/allow_query/ns2/named07.conf.in
index 3c01c680c467db3ed42a1a5bcb5186788da1abf0..72be48c989ce2a368acc2f8283db55a917ffcd94 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named07.conf
+++ b/bin/tests/system/allow_query/ns2/named07.conf.in
@@ -13,7 +13,7 @@ controls { /* empty */ };
 acl accept { 10.53.0.2; };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -21,7 +21,7 @@ options {
        allow-query { accept; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named08.conf b/bin/tests/system/allow_query/ns2/named08.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named08.conf
rename to bin/tests/system/allow_query/ns2/named08.conf.in
index 4db7453fab60faff96a48a8f5bef043c5c83ff77..cc003d5bb69a5edf5fa2d017530bed4b44d04795 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named08.conf
+++ b/bin/tests/system/allow_query/ns2/named08.conf.in
@@ -13,7 +13,7 @@ controls { /* empty */ };
 acl accept { 10.53.0.1; };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -21,7 +21,7 @@ options {
        allow-query { accept; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named09.conf b/bin/tests/system/allow_query/ns2/named09.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named09.conf
rename to bin/tests/system/allow_query/ns2/named09.conf.in
index 318ace07cafac1a01360226843a8db0454f763db..33f4b2f0a466c664e56722220fa65e052169483d 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named09.conf
+++ b/bin/tests/system/allow_query/ns2/named09.conf.in
@@ -13,7 +13,7 @@ controls { /* empty */ };
 acl accept { 10.53.0.2; };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -21,7 +21,7 @@ options {
        allow-query {! accept; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named10.conf b/bin/tests/system/allow_query/ns2/named10.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named10.conf
rename to bin/tests/system/allow_query/ns2/named10.conf.in
index 900c7c1c4c949e09856b7f9147bdfcaf5f08a0d4..43704b09249723eebaad40ae75ad90ceaf1b61d4 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named10.conf
+++ b/bin/tests/system/allow_query/ns2/named10.conf.in
@@ -17,7 +17,7 @@ key one {
 };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -25,7 +25,7 @@ options {
        allow-query { key one; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named11.conf b/bin/tests/system/allow_query/ns2/named11.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named11.conf
rename to bin/tests/system/allow_query/ns2/named11.conf.in
index 24c4d6b7105051ec9bf4cf9eba36ae1b8edb1da1..c0504ed12889f174d64eb401cc9dc5d4f04c7998 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named11.conf
+++ b/bin/tests/system/allow_query/ns2/named11.conf.in
@@ -23,7 +23,7 @@ key two {
 
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -31,7 +31,7 @@ options {
        allow-query { key one; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named12.conf b/bin/tests/system/allow_query/ns2/named12.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named12.conf
rename to bin/tests/system/allow_query/ns2/named12.conf.in
index 6d4fb286707a22e22128c5af1f328752054f26da..f376ee7eb663d2fff3cd1c2eb885b851fe07b580 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named12.conf
+++ b/bin/tests/system/allow_query/ns2/named12.conf.in
@@ -16,7 +16,7 @@ key one {
 };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -24,7 +24,7 @@ options {
        allow-query {! key one; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named21.conf b/bin/tests/system/allow_query/ns2/named21.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named21.conf
rename to bin/tests/system/allow_query/ns2/named21.conf.in
index 3ed60a5fc44b0f2e1bbe5425da5a52505ba31e7b..c28a52a795c28ab78e472cc814f4ca62cff71111 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named21.conf
+++ b/bin/tests/system/allow_query/ns2/named21.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named22.conf b/bin/tests/system/allow_query/ns2/named22.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named22.conf
rename to bin/tests/system/allow_query/ns2/named22.conf.in
index 518a6aa7c45c2800585338eea599037f7621410f..f668f0294e0fe6d8425770e5c1444a77878059f5 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named22.conf
+++ b/bin/tests/system/allow_query/ns2/named22.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 
@@ -34,4 +34,4 @@ view "internal" {
                file "normal.db";
        };
 
-};
\ No newline at end of file
+};

diff --git a/bin/tests/system/allow_query/ns2/named23.conf b/bin/tests/system/allow_query/ns2/named23.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named23.conf
rename to bin/tests/system/allow_query/ns2/named23.conf.in
index c7903122732fe942e679c527c254a76c17d9667a..a5045382172d2e811c89cab6131cfebbde7645c9 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named23.conf
+++ b/bin/tests/system/allow_query/ns2/named23.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named24.conf b/bin/tests/system/allow_query/ns2/named24.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named24.conf
rename to bin/tests/system/allow_query/ns2/named24.conf.in
index 7da2d84342269a34e21aeeb2dec7c4f57ef01ac8..eac68fbc544e2862f7f1d9ac1c75af2a998ecd48 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named24.conf
+++ b/bin/tests/system/allow_query/ns2/named24.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 
@@ -33,4 +33,4 @@ view "internal" {
                type master;
                file "normal.db";
        };
-};
\ No newline at end of file
+};

diff --git a/bin/tests/system/allow_query/ns2/named25.conf b/bin/tests/system/allow_query/ns2/named25.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named25.conf
rename to bin/tests/system/allow_query/ns2/named25.conf.in
index 8db5ba3c8072dbf3849c3c485e33ce4771fbf6cd..829350ad31a07466acd77e8b4c24d7ce570ab9f3 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named25.conf
+++ b/bin/tests/system/allow_query/ns2/named25.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 
@@ -33,4 +33,4 @@ view "internal" {
                type master;
                file "normal.db";
        };
-};
\ No newline at end of file
+};

diff --git a/bin/tests/system/allow_query/ns2/named26.conf b/bin/tests/system/allow_query/ns2/named26.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named26.conf
rename to bin/tests/system/allow_query/ns2/named26.conf.in
index c53694cff50a3ba4dcae05c56fb8a1855756f40c..6ba62295280f168583f504197f4a06b6d5114267 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named26.conf
+++ b/bin/tests/system/allow_query/ns2/named26.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named27.conf b/bin/tests/system/allow_query/ns2/named27.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named27.conf
rename to bin/tests/system/allow_query/ns2/named27.conf.in
index 0615f759bd07303c5ba5ef9dd16bf7c8b2076a8f..8092a59dea7090da6f9d6f13c6e7a161fa133b53 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named27.conf
+++ b/bin/tests/system/allow_query/ns2/named27.conf.in
@@ -13,14 +13,14 @@ controls { /* empty */ };
 acl accept { 10.53.0.2; };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named28.conf b/bin/tests/system/allow_query/ns2/named28.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named28.conf
rename to bin/tests/system/allow_query/ns2/named28.conf.in
index bf63609d377e49d425b2cc392b80bd30713d9a9e..a3327367ddcd5223887337ff2a0f69f2fca06fe2 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named28.conf
+++ b/bin/tests/system/allow_query/ns2/named28.conf.in
@@ -13,14 +13,14 @@ controls { /* empty */ };
 acl accept { 10.53.0.1; };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named29.conf b/bin/tests/system/allow_query/ns2/named29.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named29.conf
rename to bin/tests/system/allow_query/ns2/named29.conf.in
index 0e8a5b21b6a808bada18fa3f27ad9498f610bd50..dddf4043a0345eea245f6f599b0d49ce2fb006ad 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named29.conf
+++ b/bin/tests/system/allow_query/ns2/named29.conf.in
@@ -13,14 +13,14 @@ controls { /* empty */ };
 acl accept { 10.53.0.2; };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named30.conf b/bin/tests/system/allow_query/ns2/named30.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named30.conf
rename to bin/tests/system/allow_query/ns2/named30.conf.in
index f6ff492b06cb956aa9a6f60c0e2a3cc05d7155be..cf1cad459dcc44a75d7d4d42b7f9760219d5afe6 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named30.conf
+++ b/bin/tests/system/allow_query/ns2/named30.conf.in
@@ -17,14 +17,14 @@ key one {
 };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named31.conf b/bin/tests/system/allow_query/ns2/named31.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named31.conf
rename to bin/tests/system/allow_query/ns2/named31.conf.in
index be43c33224f2d47d8b53509e123a6cd778a467b6..bf2da6f662db8e954ef516e843b4a7a1226e67f1 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named31.conf
+++ b/bin/tests/system/allow_query/ns2/named31.conf.in
@@ -23,7 +23,7 @@ key two {
 
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -31,7 +31,7 @@ options {
        allow-query { key one; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 
@@ -46,4 +46,4 @@ view "internal" {
                type master;
                file "normal.db";
        };
-};
\ No newline at end of file
+};

diff --git a/bin/tests/system/allow_query/ns2/named32.conf b/bin/tests/system/allow_query/ns2/named32.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named32.conf
rename to bin/tests/system/allow_query/ns2/named32.conf.in
index 979db9c4858aaf4fe32408ce4317eee8ad0c151c..c6b3b2e54562216a8c58f0f45120d671b72591fe 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named32.conf
+++ b/bin/tests/system/allow_query/ns2/named32.conf.in
@@ -16,14 +16,14 @@ key one {
 };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named33.conf b/bin/tests/system/allow_query/ns2/named33.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named33.conf
rename to bin/tests/system/allow_query/ns2/named33.conf.in
index 3423ae110c90085d4d55d24e3a672a6f280212c6..3316d27dcee152cd9dea10f52864fc5fc0bc4324 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named33.conf
+++ b/bin/tests/system/allow_query/ns2/named33.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query { none; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named34.conf b/bin/tests/system/allow_query/ns2/named34.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named34.conf
rename to bin/tests/system/allow_query/ns2/named34.conf.in
index 5b136da815eba3c8c6e6d471f5134b1c23cd097a..2b0ce0811420c8704a447fe20e0a69224fb0549d 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named34.conf
+++ b/bin/tests/system/allow_query/ns2/named34.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query { any; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named40.conf b/bin/tests/system/allow_query/ns2/named40.conf.in
similarity index 97%
rename from bin/tests/system/allow_query/ns2/named40.conf
rename to bin/tests/system/allow_query/ns2/named40.conf.in
index 46a8d9986d441cb97be072c5455e241c1779e83f..8388f109bba71c161e1a1add751757d1e8efcaba 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named40.conf
+++ b/bin/tests/system/allow_query/ns2/named40.conf.in
@@ -25,14 +25,14 @@ key two {
 };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named53.conf b/bin/tests/system/allow_query/ns2/named53.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named53.conf
rename to bin/tests/system/allow_query/ns2/named53.conf.in
index df127d57fa246ec263bac1a0c7149330b0b2bb6d..0fed5846ce302b352d50c613d70a329be8fd5143 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named53.conf
+++ b/bin/tests/system/allow_query/ns2/named53.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query { none; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named54.conf b/bin/tests/system/allow_query/ns2/named54.conf.in
similarity index 92%
rename from bin/tests/system/allow_query/ns2/named54.conf
rename to bin/tests/system/allow_query/ns2/named54.conf.in
index fb53aae52967ca174bc4840bb758b2899b13b0cd..f8a922d3876bf29e791a34c959e5c720e27e6424 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named54.conf
+++ b/bin/tests/system/allow_query/ns2/named54.conf.in
@@ -11,7 +11,7 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
@@ -19,7 +19,7 @@ options {
        allow-query { any; };
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 zone "." {
        type hint;

diff --git a/bin/tests/system/allow_query/ns2/named55.conf b/bin/tests/system/allow_query/ns2/named55.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named55.conf
rename to bin/tests/system/allow_query/ns2/named55.conf.in
index 6cffdd5cd364615bae5b7730c60e40e9065a83cb..e577ec6a3d25e6c1a81fa05d0a67ee62338d3fc5 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named55.conf
+++ b/bin/tests/system/allow_query/ns2/named55.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named56.conf b/bin/tests/system/allow_query/ns2/named56.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named56.conf
rename to bin/tests/system/allow_query/ns2/named56.conf.in
index 64b98d2a138087fb39fc1fa0030b29f2e138330f..05daff6a527bb4cb8692745a9b0d9b17f3e7b565 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named56.conf
+++ b/bin/tests/system/allow_query/ns2/named56.conf.in
@@ -11,14 +11,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
 

diff --git a/bin/tests/system/allow_query/ns2/named57.conf b/bin/tests/system/allow_query/ns2/named57.conf.in
similarity index 93%
rename from bin/tests/system/allow_query/ns2/named57.conf
rename to bin/tests/system/allow_query/ns2/named57.conf.in
index dd3923758924b06bf6a5140cfa00f23d9611ed94..7bd9f7a5bb92897d23b2d68099c252a2abe5d086 100644 (file)
--- a/bin/tests/system/allow_query/ns2/named57.conf
+++ b/bin/tests/system/allow_query/ns2/named57.conf.in
@@ -9,14 +9,14 @@
 controls { /* empty */ };
 
 options {
-       port 5300;
+       port @PORT@;
        pid-file "named.pid";
        listen-on { 10.53.0.2; };
        listen-on-v6 { none; };
        recursion no;
 };
 
-include "../../common/controls.conf";
+include "controls.conf";
 
 view "internal" {
        allow-query-on { any; };

diff --git a/bin/tests/system/allow_query/setup.sh b/bin/tests/system/allow_query/setup.sh
index b5ef0b96a0d267dd2d209bfd9cc541dbcb7208d6..b267da98e67454d0348065f8d67d36364e1a5515 100644 (file)
--- a/bin/tests/system/allow_query/setup.sh
+++ b/bin/tests/system/allow_query/setup.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 #
 # Copyright (C) 2010, 2012, 2016  Internet Systems Consortium, Inc. ("ISC")
 #
@@ -8,4 +8,8 @@
 
 # $Id: setup.sh,v 1.2 2010/11/16 01:37:36 sar Exp $
 
-cp -f ns2/named01.conf ns2/named.conf
+. ../getopts.sh
+
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ../common/controls.conf.in > ns2/controls.conf
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named01.conf.in > ns2/named.conf
+echo "${port}" > ns2/named.port

diff --git a/bin/tests/system/allow_query/tests.sh b/bin/tests/system/allow_query/tests.sh
index 8029f9e4970b8585ee16c8c4b58435f6140b1f03..29129b12e76ce840782e839651a21a5f028da7f4 100644 (file)
--- a/bin/tests/system/allow_query/tests.sh
+++ b/bin/tests/system/allow_query/tests.sh
@@ -52,7 +52,10 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p 5300"
+. ../getopts.sh
+
+DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${port}"
+RNDCCMD="$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${controlport}"
 status=0
 n=0
 
@@ -68,8 +71,8 @@ status=`expr $status + $ret`
 
 # Test 2 - explicit any, query allowed
 n=`expr $n + 1`
-cp -f ns2/named02.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named02.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: explicit any - query allowed"
@@ -82,8 +85,8 @@ status=`expr $status + $ret`
 
 # Test 3 - none, query refused
 n=`expr $n + 1`
-cp -f ns2/named03.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named03.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: none - query refused"
@@ -96,8 +99,8 @@ status=`expr $status + $ret`
 
 # Test 4 - address allowed, query allowed
 n=`expr $n + 1`
-cp -f ns2/named04.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named04.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: address allowed - query allowed"
@@ -110,8 +113,8 @@ status=`expr $status + $ret`
 
 # Test 5 - address not allowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named05.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named05.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: address not allowed - query refused"
@@ -124,8 +127,8 @@ status=`expr $status + $ret`
 
 # Test 6 - address disallowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named06.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named06.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: address disallowed - query refused"
@@ -138,8 +141,8 @@ status=`expr $status + $ret`
 
 # Test 7 - acl allowed, query allowed
 n=`expr $n + 1`
-cp -f ns2/named07.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named07.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: acl allowed - query allowed"
@@ -152,8 +155,8 @@ status=`expr $status + $ret`
 
 # Test 8 - acl not allowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named08.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named08.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: acl not allowed - query refused"
@@ -167,8 +170,8 @@ status=`expr $status + $ret`
 
 # Test 9 - acl disallowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named09.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named09.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: acl disallowed - query refused"
@@ -181,8 +184,8 @@ status=`expr $status + $ret`
 
 # Test 10 - key allowed, query allowed
 n=`expr $n + 1`
-cp -f ns2/named10.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named10.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: key allowed - query allowed"
@@ -195,8 +198,8 @@ status=`expr $status + $ret`
 
 # Test 11 - key not allowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named11.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named11.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: key not allowed - query refused"
@@ -209,8 +212,8 @@ status=`expr $status + $ret`
 
 # Test 12 - key disallowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named12.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named12.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: key disallowed - query refused"
@@ -226,8 +229,8 @@ status=`expr $status + $ret`
 n=20
 # Test 21 - views default, query allowed
 n=`expr $n + 1`
-cp -f ns2/named21.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named21.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views default - query allowed"
@@ -240,8 +243,8 @@ status=`expr $status + $ret`
 
 # Test 22 - views explicit any, query allowed
 n=`expr $n + 1`
-cp -f ns2/named22.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named22.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views explicit any - query allowed"
@@ -254,8 +257,8 @@ status=`expr $status + $ret`
 
 # Test 23 - views none, query refused
 n=`expr $n + 1`
-cp -f ns2/named23.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named23.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views none - query refused"
@@ -268,8 +271,8 @@ status=`expr $status + $ret`
 
 # Test 24 - views address allowed, query allowed
 n=`expr $n + 1`
-cp -f ns2/named24.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named24.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views address allowed - query allowed"
@@ -282,8 +285,8 @@ status=`expr $status + $ret`
 
 # Test 25 - views address not allowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named25.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named25.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views address not allowed - query refused"
@@ -296,8 +299,8 @@ status=`expr $status + $ret`
 
 # Test 26 - views address disallowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named26.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named26.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views address disallowed - query refused"
@@ -310,8 +313,8 @@ status=`expr $status + $ret`
 
 # Test 27 - views acl allowed, query allowed
 n=`expr $n + 1`
-cp -f ns2/named27.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named27.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views acl allowed - query allowed"
@@ -324,8 +327,8 @@ status=`expr $status + $ret`
 
 # Test 28 - views acl not allowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named28.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named28.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views acl not allowed - query refused"
@@ -338,8 +341,8 @@ status=`expr $status + $ret`
 
 # Test 29 - views acl disallowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named29.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named29.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views acl disallowed - query refused"
@@ -352,8 +355,8 @@ status=`expr $status + $ret`
 
 # Test 30 - views key allowed, query allowed
 n=`expr $n + 1`
-cp -f ns2/named30.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named30.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views key allowed - query allowed"
@@ -366,8 +369,8 @@ status=`expr $status + $ret`
 
 # Test 31 - views key not allowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named31.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named31.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views key not allowed - query refused"
@@ -380,8 +383,8 @@ status=`expr $status + $ret`
 
 # Test 32 - views key disallowed, query refused
 n=`expr $n + 1`
-cp -f ns2/named32.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named32.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views key disallowed - query refused"
@@ -394,8 +397,8 @@ status=`expr $status + $ret`
 
 # Test 33 - views over options, views allow, query allowed
 n=`expr $n + 1`
-cp -f ns2/named33.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named33.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views over options, views allow - query allowed"
@@ -408,8 +411,8 @@ status=`expr $status + $ret`
 
 # Test 34 - views over options, views disallow, query refused
 n=`expr $n + 1`
-cp -f ns2/named34.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named34.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views over options, views disallow - query refused"
@@ -426,8 +429,8 @@ n=40
 
 # Test 41 - zone default, query allowed
 n=`expr $n + 1`
-cp -f ns2/named40.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named40.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: zone default - query allowed"
@@ -550,8 +553,8 @@ status=`expr $status + $ret`
 
 # Test 53 - zones over options, zones allow, query allowed
 n=`expr $n + 1`
-cp -f ns2/named53.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named53.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views over options, views allow - query allowed"
@@ -564,8 +567,8 @@ status=`expr $status + $ret`
 
 # Test 54 - zones over options, zones disallow, query refused
 n=`expr $n + 1`
-cp -f ns2/named54.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named54.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: views over options, views disallow - query refused"
@@ -578,8 +581,8 @@ status=`expr $status + $ret`
 
 # Test 55 - zones over views, zones allow, query allowed
 n=`expr $n + 1`
-cp -f ns2/named55.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named55.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: zones over views, views allow - query allowed"
@@ -592,8 +595,8 @@ status=`expr $status + $ret`
 
 # Test 56 - zones over views, zones disallow, query refused
 n=`expr $n + 1`
-cp -f ns2/named56.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named56.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: zones over views, views disallow - query refused"
@@ -606,8 +609,8 @@ status=`expr $status + $ret`
 
 # Test 57 - zones over views, zones disallow, query refused (allow-query-on)
 n=`expr $n + 1`
-cp -f ns2/named57.conf ns2/named.conf
-$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
+sed -e "s/@PORT@/${port}/g;s/@CONTROLPORT@/${controlport}/g;" < ns2/named57.conf.in > ns2/named.conf
+$RNDCCMD reload 2>&1 | sed 's/^/I:ns2 /'
 sleep 5
 
 echo "I:test $n: zones over views, allow-query-on"

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index cd3ffffc9067ea5454f8ab5ac44c7eb82b5ab3bf..27a4bee42440eacd7da5b61a14b8f06a8bbbc846 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -72,7 +72,7 @@ KRB5_CONFIG=/dev/null
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
 # v6synth
-SUBDIRS="acl additional addzone allow_query auth autosign builtin
+SUBDIRS="acl additional addzone auth autosign builtin
         cacheclean case catz cds chain
          checkconf @CHECKDS@ checknames checkzone cookie @COVERAGE@
          database digdelv dlv dlz dlzexternal