From 992a2bafec6ab120909402ea3e0d2831d92dac59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 18 Oct 2017 13:38:20 +0200 Subject: [PATCH] [rt46602] Convert allow_query to dynamic port --- bin/tests/system/Makefile.in | 13 +- bin/tests/system/allow_query/clean.sh | 2 +- .../ns2/{named01.conf => named01.conf.in} | 4 +- .../ns2/{named02.conf => named02.conf.in} | 4 +- .../ns2/{named03.conf => named03.conf.in} | 4 +- .../ns2/{named04.conf => named04.conf.in} | 4 +- .../ns2/{named05.conf => named05.conf.in} | 4 +- .../ns2/{named06.conf => named06.conf.in} | 4 +- .../ns2/{named07.conf => named07.conf.in} | 4 +- .../ns2/{named08.conf => named08.conf.in} | 4 +- .../ns2/{named09.conf => named09.conf.in} | 4 +- .../ns2/{named10.conf => named10.conf.in} | 4 +- .../ns2/{named11.conf => named11.conf.in} | 4 +- .../ns2/{named12.conf => named12.conf.in} | 4 +- .../ns2/{named21.conf => named21.conf.in} | 4 +- .../ns2/{named22.conf => named22.conf.in} | 6 +- .../ns2/{named23.conf => named23.conf.in} | 4 +- .../ns2/{named24.conf => named24.conf.in} | 6 +- .../ns2/{named25.conf => named25.conf.in} | 6 +- .../ns2/{named26.conf => named26.conf.in} | 4 +- .../ns2/{named27.conf => named27.conf.in} | 4 +- .../ns2/{named28.conf => named28.conf.in} | 4 +- .../ns2/{named29.conf => named29.conf.in} | 4 +- .../ns2/{named30.conf => named30.conf.in} | 4 +- .../ns2/{named31.conf => named31.conf.in} | 6 +- .../ns2/{named32.conf => named32.conf.in} | 4 +- .../ns2/{named33.conf => named33.conf.in} | 4 +- .../ns2/{named34.conf => named34.conf.in} | 4 +- .../ns2/{named40.conf => named40.conf.in} | 4 +- .../ns2/{named53.conf => named53.conf.in} | 4 +- .../ns2/{named54.conf => named54.conf.in} | 4 +- .../ns2/{named55.conf => named55.conf.in} | 4 +- .../ns2/{named56.conf => named56.conf.in} | 4 +- .../ns2/{named57.conf => named57.conf.in} | 4 +- bin/tests/system/allow_query/setup.sh | 8 +- bin/tests/system/allow_query/tests.sh | 129 +++++++++--------- bin/tests/system/conf.sh.in | 2 +- 37 files changed, 151 insertions(+), 139 deletions(-) rename bin/tests/system/allow_query/ns2/{named01.conf => named01.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named02.conf => named02.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named03.conf => named03.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named04.conf => named04.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named05.conf => named05.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named06.conf => named06.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named07.conf => named07.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named08.conf => named08.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named09.conf => named09.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named10.conf => named10.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named11.conf => named11.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named12.conf => named12.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named21.conf => named21.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named22.conf => named22.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named23.conf => named23.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named24.conf => named24.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named25.conf => named25.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named26.conf => named26.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named27.conf => named27.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named28.conf => named28.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named29.conf => named29.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named30.conf => named30.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named31.conf => named31.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named32.conf => named32.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named33.conf => named33.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named34.conf => named34.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named40.conf => named40.conf.in} (97%) rename bin/tests/system/allow_query/ns2/{named53.conf => named53.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named54.conf => named54.conf.in} (92%) rename bin/tests/system/allow_query/ns2/{named55.conf => named55.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named56.conf => named56.conf.in} (93%) rename bin/tests/system/allow_query/ns2/{named57.conf => named57.conf.in} (93%) diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 2ff0b8e5d7..16a5f6c96b 100644 --- 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 64599ec800..15c4ee833a 100644 --- 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 21bccd529b..7c26a7296c 100644 --- 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 86ac4a9f1b..80c1439207 100644 --- 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 d28b6b0248..bc1f4ca27f 100644 --- 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 b6bb5e935d..66d04780a1 100644 --- 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 8527bb8700..4f26e6665e 100644 --- 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 91dd0a686b..39f9979139 100644 --- 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 3c01c680c4..72be48c989 100644 --- 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 4db7453fab..cc003d5bb6 100644 --- 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 318ace07ca..33f4b2f0a4 100644 --- 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 900c7c1c4c..43704b0924 100644 --- 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 24c4d6b710..c0504ed128 100644 --- 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 6d4fb28670..f376ee7eb6 100644 --- 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 3ed60a5fc4..c28a52a795 100644 --- 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 518a6aa7c4..f668f0294e 100644 --- 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 c790312273..a504538217 100644 --- 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 7da2d84342..eac68fbc54 100644 --- 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 8db5ba3c80..829350ad31 100644 --- 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 c53694cff5..6ba6229528 100644 --- 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 0615f759bd..8092a59dea 100644 --- 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 bf63609d37..a3327367dd 100644 --- 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 0e8a5b21b6..dddf4043a0 100644 --- 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 f6ff492b06..cf1cad459d 100644 --- 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 be43c33224..bf2da6f662 100644 --- 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 979db9c485..c6b3b2e545 100644 --- 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 3423ae110c..3316d27dce 100644 --- 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 5b136da815..2b0ce08114 100644 --- 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 46a8d9986d..8388f109bb 100644 --- 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 df127d57fa..0fed5846ce 100644 --- 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 fb53aae529..f8a922d387 100644 --- 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 6cffdd5cd3..e577ec6a3d 100644 --- 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 64b98d2a13..05daff6a52 100644 --- 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 dd39237589..7bd9f7a5bb 100644 --- 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 b5ef0b96a0..b267da98e6 100644 --- 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 8029f9e497..29129b12e7 100644 --- 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 cd3ffffc90..27a4bee424 100644 --- 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