From: Mark Andrews <marka@isc.org>
Date: Fri, 15 Nov 2013 02:16:51 +0000 (+1100)
Subject: move forwarder server to 10.53.0.5
X-Git-Tag: v9.10.0a1~14
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=3ac9ef6a6d3ec74c8b8cdf9916fc83ae3625385b;p=thirdparty%2Fbind9.git

move forwarder server to 10.53.0.5
---

diff --git a/bin/tests/system/views/ns2/named2.conf b/bin/tests/system/views/ns2/named2.conf
index 3c8e033ca79..7dd5f0b6fc0 100644
--- a/bin/tests/system/views/ns2/named2.conf
+++ b/bin/tests/system/views/ns2/named2.conf
@@ -71,6 +71,6 @@ view "external" {
 	zone "clone" {
 		in-view internal;
 		forward only;
-		forwarders { 10.53.0.4; };
+		forwarders { 10.53.0.5; };
 	};
 };
diff --git a/bin/tests/system/views/ns4/child.clone.db b/bin/tests/system/views/ns5/child.clone.db
similarity index 98%
rename from bin/tests/system/views/ns4/child.clone.db
rename to bin/tests/system/views/ns5/child.clone.db
index a5c6e64a176..61201c24632 100644
--- a/bin/tests/system/views/ns4/child.clone.db
+++ b/bin/tests/system/views/ns5/child.clone.db
@@ -22,5 +22,5 @@ $TTL 300	; 5 minutes
 			3600       ; minimum (1 hour)
 			)
 @		NS	ns3
-@		TXT	This is NS4.
+@		TXT	This is NS5.
 ns3		A	10.53.0.3
diff --git a/bin/tests/system/views/ns4/named.conf b/bin/tests/system/views/ns5/named.conf
similarity index 87%
rename from bin/tests/system/views/ns4/named.conf
rename to bin/tests/system/views/ns5/named.conf
index f191ca22370..6fadbb46710 100644
--- a/bin/tests/system/views/ns4/named.conf
+++ b/bin/tests/system/views/ns5/named.conf
@@ -19,13 +19,13 @@
 controls { /* empty */ };
 
 options {
-	query-source address 10.53.0.4;
-	notify-source 10.53.0.4;
-	transfer-source 10.53.0.4;
+	query-source address 10.53.0.5;
+	notify-source 10.53.0.5;
+	transfer-source 10.53.0.5;
 	port 5300;
 	directory ".";
 	pid-file "named.pid";
-	listen-on { 10.53.0.4; };
+	listen-on { 10.53.0.5; };
 	listen-on-v6 { none; };
 	recursion yes;
 	notify yes;
@@ -37,7 +37,7 @@ key rndc_key {
 };
 
 controls {
-	inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
+	inet 10.53.0.5 port 9953 allow { any; } keys { rndc_key; };
 };
 
 zone "." {
diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh
index 3912defcba0..30116bf14ce 100644
--- a/bin/tests/system/views/tests.sh
+++ b/bin/tests/system/views/tests.sh
@@ -105,7 +105,7 @@ ret=0
 one=`$DIG +tcp +short -p 5300 -b 10.53.0.2 @10.53.0.2 child.clone txt`
 two=`$DIG +tcp +short -p 5300 -b 10.53.0.4 @10.53.0.2 child.clone txt`
 three=`$DIG +tcp +short -p 5300 @10.53.0.3 child.clone txt`
-four=`$DIG +tcp +short -p 5300 @10.53.0.4 child.clone txt`
+four=`$DIG +tcp +short -p 5300 @10.53.0.5 child.clone txt`
 if [ "$one" = "$two" ]; then
         echo "'$one' matches '$two'"
         ret=1