[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 38d1329fefea69cdef29ff22d390bcfb7623af7c..fe012cf8ec4eae2e4550b5b707f946831f0a6105 100644 (file)
--- 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 53871bb0813065cbbfe22e7018703ddfa51a09c5..f60a24007b6619143bd914cce9bcedda3740bd62 100644 (file)
--- 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 059fde7f17934b1e7f9c4493bbdf75f0f3d3fdcd..a9d58a8b68cd73f7ec599eff3c6e014cd82eddb1 100644 (file)
--- 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 e89c2afed32a0e7c4368428e49ab4e7d5879d6ea..2c8153dc65c28a274858e79eeb54185f542e218c 100644 (file)
--- 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 7f04ff8de14ac92464e1ee181ee9e4983cd32f77..aa6e2bb5d8b370ac40844264f2ed7448112569c4 100644 (file)
--- 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 b7df040d8372a68fa5c139125de43e731c6f1f64..f7f6eee3b1b7a6b282a792a0c87b86a57c3bf5a1 100644 (file)
--- 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 844f452a4b40bbb8086163ed8881919ec55d62b6..f8b96ea16fd14ada40fbcfd84fbf4fb570af9f66 100644 (file)
--- 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"