From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 28 Jan 2013 07:36:20 +0000 (+0530)
Subject: [2390] Update zones to start using relative names
X-Git-Tag: bind10-1.0.0-rc-release~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c42816e5f405de02ef30728d82fcb045cf6a803;p=thirdparty%2Fkea.git

[2390] Update zones to start using relative names
---

diff --git a/src/bin/loadzone/tests/correct/example.db b/src/bin/loadzone/tests/correct/example.db
index 38d1329fef..fe012cf8ec 100644
--- a/src/bin/loadzone/tests/correct/example.db
+++ b/src/bin/loadzone/tests/correct/example.db
@@ -2,17 +2,11 @@
 $ORIGIN example.com.
 $TTL 60
 @    IN SOA   ns1.example.com. hostmaster.example.com. (1 43200 900 1814400 7200)
-; these need #2390
-;     IN     20      NS  ns1
-;                    NS  ns2
-     IN     20      NS  ns1.example.com.
-                    NS  ns2.example.com.
+     IN     20      NS  ns1
+                    NS  ns2
 ns1  IN     30      A   192.168.1.102
-; these need #2390
-;            70      NS  ns3
-;     IN             NS  ns4
-            70      NS  ns3.example.com.
-     IN             NS  ns4.example.com.
+            70      NS  ns3
+     IN             NS  ns4
      10     IN      MX  10  mail.example.com.
 ns2         80      A   1.1.1.1
 ns3  IN             A   2.2.2.2
diff --git a/src/bin/loadzone/tests/correct/include.db b/src/bin/loadzone/tests/correct/include.db
index 53871bb081..f60a24007b 100644
--- a/src/bin/loadzone/tests/correct/include.db
+++ b/src/bin/loadzone/tests/correct/include.db
@@ -7,9 +7,7 @@ $TTL 300
 				1814400
 				3600
 				)
-; this needs #2390
-;			NS	ns
-			NS	ns.include.
+			NS	ns
 
 ns			A	127.0.0.1
 
diff --git a/src/bin/loadzone/tests/correct/mix1.db b/src/bin/loadzone/tests/correct/mix1.db
index 059fde7f17..a9d58a8b68 100644
--- a/src/bin/loadzone/tests/correct/mix1.db
+++ b/src/bin/loadzone/tests/correct/mix1.db
@@ -6,9 +6,7 @@ $ORIGIN mix1.
 				1814400
 				3
 				)
-; this needs #2390
-;			NS	ns
-			NS	ns.mix1.
+			NS	ns
 ns			A	10.53.0.1
 a			TXT	"soa minttl 3"
 b		2	TXT	"explicit ttl 2"
diff --git a/src/bin/loadzone/tests/correct/mix2.db b/src/bin/loadzone/tests/correct/mix2.db
index e89c2afed3..2c8153dc65 100644
--- a/src/bin/loadzone/tests/correct/mix2.db
+++ b/src/bin/loadzone/tests/correct/mix2.db
@@ -6,9 +6,7 @@ $ORIGIN mix2.
 				1814400
 				3
 				)
-; this needs #2390
-;			NS	ns
-			NS	ns.mix2.
+			NS	ns
 ns			A	10.53.0.1
 a			TXT	"inherited ttl 1"
 $INCLUDE mix2sub1.txt
diff --git a/src/bin/loadzone/tests/correct/ttl1.db b/src/bin/loadzone/tests/correct/ttl1.db
index 7f04ff8de1..aa6e2bb5d8 100644
--- a/src/bin/loadzone/tests/correct/ttl1.db
+++ b/src/bin/loadzone/tests/correct/ttl1.db
@@ -6,9 +6,7 @@ $ORIGIN ttl1.
 				1814400
 				3
 				)
-; this needs #2390
-;			NS	ns
-			NS	ns.ttl1.
+			NS	ns
 ns			A	10.53.0.1
 a			TXT	"soa minttl 3"
 b		2	TXT	"explicit ttl 2"
diff --git a/src/bin/loadzone/tests/correct/ttl2.db b/src/bin/loadzone/tests/correct/ttl2.db
index b7df040d83..f7f6eee3b1 100644
--- a/src/bin/loadzone/tests/correct/ttl2.db
+++ b/src/bin/loadzone/tests/correct/ttl2.db
@@ -6,9 +6,7 @@ $ORIGIN ttl2.
 				1814400
 				3
 				)
-; this needs #2390
-;			NS	ns
-			NS	ns.ttl2.
+			NS	ns
 ns			A	10.53.0.1
 a			TXT	"inherited ttl 1"
 b		2	TXT	"explicit ttl 2"
diff --git a/src/bin/loadzone/tests/correct/ttlext.db b/src/bin/loadzone/tests/correct/ttlext.db
index 844f452a4b..f8b96ea16f 100644
--- a/src/bin/loadzone/tests/correct/ttlext.db
+++ b/src/bin/loadzone/tests/correct/ttlext.db
@@ -6,9 +6,7 @@ $ORIGIN ttlext.
 				1814400
 				3
 				)
-; this needs #2390
-;			NS	ns
-			NS	ns.ttlext.
+			NS	ns
 ns			A	10.53.0.1
 a			TXT	"soa minttl 3"
 b		2S	TXT	"explicit ttl 2"