[2500] re-enabled non-absolute name in SOA Rdata for loadzone tests.

this will pass on completion of this task.

diff --git a/src/bin/loadzone/tests/correct/include.db b/src/bin/loadzone/tests/correct/include.db
index a9eeca33b53d97731615850220e86a58c274152d..53871bb0813065cbbfe22e7018703ddfa51a09c5 100644 (file)
--- a/src/bin/loadzone/tests/correct/include.db
+++ b/src/bin/loadzone/tests/correct/include.db
@@ -1,8 +1,6 @@
 $ORIGIN include.   ; initialize origin
 $TTL 300
-; this needs #2500
-;@                     IN SOA  ns hostmaster (
-@                      IN SOA  ns.include. hostmaster.include. (
+@                      IN SOA  ns hostmaster (
                                1        ; serial
                                3600
                                1800

diff --git a/src/bin/loadzone/tests/correct/mix1.db b/src/bin/loadzone/tests/correct/mix1.db
index 5bc0a95e6205dce4f78a1b429539b34e7408c2c0..059fde7f17934b1e7f9c4493bbdf75f0f3d3fdcd 100644 (file)
--- a/src/bin/loadzone/tests/correct/mix1.db
+++ b/src/bin/loadzone/tests/correct/mix1.db
@@ -1,7 +1,5 @@
 $ORIGIN mix1.
-; this needs #2500
-;@                     IN SOA  ns hostmaster (
-@                      IN SOA  ns.mix1. hostmaster.mix1. (
+@                      IN SOA  ns hostmaster (
                                1        ; serial
                                3600
                                1800

diff --git a/src/bin/loadzone/tests/correct/mix2.db b/src/bin/loadzone/tests/correct/mix2.db
index e43b943f4e90635437211518f2340d0376ada97f..e89c2afed32a0e7c4368428e49ab4e7d5879d6ea 100644 (file)
--- a/src/bin/loadzone/tests/correct/mix2.db
+++ b/src/bin/loadzone/tests/correct/mix2.db
@@ -1,7 +1,5 @@
 $ORIGIN mix2.
-; this needs #2500
-;@             1       IN SOA  ns hostmaster (
-@              1       IN SOA  ns.mix2. hostmaster.mix2. (
+@              1       IN SOA  ns hostmaster (
                                1        ; serial
                                3600
                                1800

diff --git a/src/bin/loadzone/tests/correct/ttl1.db b/src/bin/loadzone/tests/correct/ttl1.db
index fec081326cbcd15e1c9c017b986e682a2174f490..7f04ff8de14ac92464e1ee181ee9e4983cd32f77 100644 (file)
--- a/src/bin/loadzone/tests/correct/ttl1.db
+++ b/src/bin/loadzone/tests/correct/ttl1.db
@@ -1,7 +1,5 @@
 $ORIGIN ttl1.
-; this needs #2500
-;@                     IN SOA  ns hostmaster (
-@                      IN SOA  ns.ttl1. hostmaster.ttl1. (
+@                      IN SOA  ns hostmaster (
                                1        ; serial
                                3600
                                1800

diff --git a/src/bin/loadzone/tests/correct/ttl2.db b/src/bin/loadzone/tests/correct/ttl2.db
index 47059786e91e4cbf7e25c13a33b2f3d6ba60a206..b7df040d8372a68fa5c139125de43e731c6f1f64 100644 (file)
--- a/src/bin/loadzone/tests/correct/ttl2.db
+++ b/src/bin/loadzone/tests/correct/ttl2.db
@@ -1,7 +1,5 @@
 $ORIGIN ttl2.
-; this needs #2500
-;@             1       IN SOA  ns hostmaster (
-@              1       IN SOA  ns.ttl2. hostmaster.ttl2 (
+@              1       IN SOA  ns hostmaster (
                                1        ; serial
                                3600
                                1800

diff --git a/src/bin/loadzone/tests/correct/ttlext.db b/src/bin/loadzone/tests/correct/ttlext.db
index f8c83b011b6f70a210090e8a9a8d941061b125c1..844f452a4b40bbb8086163ed8881919ec55d62b6 100644 (file)
--- a/src/bin/loadzone/tests/correct/ttlext.db
+++ b/src/bin/loadzone/tests/correct/ttlext.db
@@ -1,7 +1,5 @@
 $ORIGIN ttlext.
-; this needs #2500
-;@                     IN SOA  ns hostmaster (
-@                      IN SOA  ns.ttlext. hostmaster.ttlext. (
+@                      IN SOA  ns hostmaster (
                                1        ; serial
                                3600
                                1800