.zone -> .db

diff --git a/bin/tests/system/staticstub/clean.sh b/bin/tests/system/staticstub/clean.sh
index 67f535497301a5497412a9684e846912dd8704e2..d1c2e5799e297dd7c8e165d675015bf758ee9be6 100755 (executable)
--- a/bin/tests/system/staticstub/clean.sh
+++ b/bin/tests/system/staticstub/clean.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.2 2010/12/16 09:51:27 jinmei Exp $
+# $Id: clean.sh,v 1.3 2010/12/17 00:57:38 marka Exp $
 
 rm -rf */*.signed
 rm -rf */K*
@@ -26,6 +26,6 @@ rm -f ns?/named.memstats
 rm -f ns?/named_dump.db
 rm -f ns2/named.conf
 rm -f ns3/named.conf
-rm -f ns3/example.zone
-rm -f ns4/sub.example.zone
+rm -f ns3/example.db
+rm -f ns4/sub.example.db
 rm -f dig.out.*

diff --git a/bin/tests/system/staticstub/ns1/named.conf b/bin/tests/system/staticstub/ns1/named.conf
index 7997cd51d6b3b52f3953ffff98a5d474249b75d4..b083d7af670193300d9ef387fd8c8671d5634424 100644 (file)
--- a/bin/tests/system/staticstub/ns1/named.conf
+++ b/bin/tests/system/staticstub/ns1/named.conf
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: named.conf,v 1.2 2010/12/16 09:51:28 jinmei Exp $ */
+/* $Id: named.conf,v 1.3 2010/12/17 00:57:38 marka Exp $ */
 
 controls { /* empty */ };
 
@@ -28,4 +28,4 @@ options {
        notify no;
 };
 
-zone "." { type master; file "root.zone"; };
+zone "." { type master; file "root.db"; };

diff --git a/bin/tests/system/staticstub/ns1/root.zone b/bin/tests/system/staticstub/ns1/root.db
similarity index 94%
rename from bin/tests/system/staticstub/ns1/root.zone
rename to bin/tests/system/staticstub/ns1/root.db
index 209d077d4bfa49e8a76b3902a715c31713a5f135..12e251e16b26403c5c9c4e98638e443e271f5892 100644 (file)
--- a/bin/tests/system/staticstub/ns1/root.zone
+++ b/bin/tests/system/staticstub/ns1/root.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: root.zone,v 1.2 2010/12/16 09:51:28 jinmei Exp $
+; $Id: root.db,v 1.1 2010/12/17 00:57:38 marka Exp $
 
 $TTL   120
 @              SOA     ns.utld hostmaster.ns.utld ( 46 3600 1200 604800 60 )

diff --git a/bin/tests/system/staticstub/ns3/example.zone.in b/bin/tests/system/staticstub/ns3/example.db.in
similarity index 95%
rename from bin/tests/system/staticstub/ns3/example.zone.in
rename to bin/tests/system/staticstub/ns3/example.db.in
index 0e8b64ea6be37ac9e5e25e7aa4434054a1f2a49f..0981cb1a9298be8fd52b01e6b2a8748fd75035cd 100644 (file)
--- a/bin/tests/system/staticstub/ns3/example.zone.in
+++ b/bin/tests/system/staticstub/ns3/example.db.in
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.zone.in,v 1.2 2010/12/16 09:51:28 jinmei Exp $
+; $Id: example.db.in,v 1.1 2010/12/17 00:57:39 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/staticstub/ns3/example.org.zone b/bin/tests/system/staticstub/ns3/example.org.db
similarity index 94%
rename from bin/tests/system/staticstub/ns3/example.org.zone
rename to bin/tests/system/staticstub/ns3/example.org.db
index 45c572d4280cf9f8531af8b9d3c58999540f2985..23d7a5dd3fa8cefe259adfc8e2759b0bb275ddde 100644 (file)
--- a/bin/tests/system/staticstub/ns3/example.org.zone
+++ b/bin/tests/system/staticstub/ns3/example.org.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.org.zone,v 1.2 2010/12/16 09:51:28 jinmei Exp $
+; $Id: example.org.db,v 1.1 2010/12/17 00:57:39 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/staticstub/ns3/named.conf.in b/bin/tests/system/staticstub/ns3/named.conf.in
index 5237ee3bf5493dba94507a84639756ac001b4b8d..239c28e7bff0426cf24af7dc73650f31a3c6b6cc 100644 (file)
--- a/bin/tests/system/staticstub/ns3/named.conf.in
+++ b/bin/tests/system/staticstub/ns3/named.conf.in
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: named.conf.in,v 1.2 2010/12/16 09:51:28 jinmei Exp $
+# $Id: named.conf.in,v 1.3 2010/12/17 00:57:39 marka Exp $
 
 key rndc_key {
         secret "1234abcd8765";
@@ -39,5 +39,5 @@ EXAMPLE_ZONE_PLACEHOLDER
 
 zone "example.org" {
        type master;
-       file "example.org.zone";
+       file "example.org.db";
 };

diff --git a/bin/tests/system/staticstub/ns3/sign.sh b/bin/tests/system/staticstub/ns3/sign.sh
index da2d048b62b5efa85dd4aa97f4e198c8579f50d1..513f7687ebaefd403aed0fa18c24f10ccac0ad9f 100755 (executable)
--- a/bin/tests/system/staticstub/ns3/sign.sh
+++ b/bin/tests/system/staticstub/ns3/sign.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.2 2010/12/16 09:51:28 jinmei Exp $
+# $Id: sign.sh,v 1.3 2010/12/17 00:57:39 marka Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
@@ -22,8 +22,8 @@ SYSTEMTESTTOP=../..
 RANDFILE=../random.data
 
 zone=example.
-infile=example.zone.in
-zonefile=example.zone
+infile=example.db.in
+zonefile=example.db
 
 (cd ../ns4 && sh -e sign.sh )
 

diff --git a/bin/tests/system/staticstub/ns4/example.com.zone b/bin/tests/system/staticstub/ns4/example.com.db
similarity index 94%
rename from bin/tests/system/staticstub/ns4/example.com.zone
rename to bin/tests/system/staticstub/ns4/example.com.db
index 087c8c8c0bade989cdfd4dffebd9b662c2a419ea..25489d2794967e6c25d5f77758cda93188c56759 100644 (file)
--- a/bin/tests/system/staticstub/ns4/example.com.zone
+++ b/bin/tests/system/staticstub/ns4/example.com.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.com.zone,v 1.2 2010/12/16 09:51:29 jinmei Exp $
+; $Id: example.com.db,v 1.1 2010/12/17 00:57:39 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/staticstub/ns4/example.info.zone b/bin/tests/system/staticstub/ns4/example.info.db
similarity index 94%
rename from bin/tests/system/staticstub/ns4/example.info.zone
rename to bin/tests/system/staticstub/ns4/example.info.db
index fad71caeba1e62f40cf6bcfdec6b876274393633..73c62b125c99e90e36b64e10241b80a9c01cc793 100644 (file)
--- a/bin/tests/system/staticstub/ns4/example.info.zone
+++ b/bin/tests/system/staticstub/ns4/example.info.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.info.zone,v 1.2 2010/12/16 09:51:29 jinmei Exp $
+; $Id: example.info.db,v 1.1 2010/12/17 00:57:39 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/staticstub/ns4/example.org.zone b/bin/tests/system/staticstub/ns4/example.org.db
similarity index 94%
rename from bin/tests/system/staticstub/ns4/example.org.zone
rename to bin/tests/system/staticstub/ns4/example.org.db
index 6168ef96dc592d6b4580dd7d7575535dae5ae33c..5007bc5877210e0b4327a0c9edc5909612f4a097 100644 (file)
--- a/bin/tests/system/staticstub/ns4/example.org.zone
+++ b/bin/tests/system/staticstub/ns4/example.org.db
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example.org.zone,v 1.2 2010/12/16 09:51:29 jinmei Exp $
+; $Id: example.org.db,v 1.1 2010/12/17 00:57:39 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/staticstub/ns4/named.conf b/bin/tests/system/staticstub/ns4/named.conf
index ac1d5f88b947b76a5022606759678e7ab933cccd..3b471b374e4c688519f7040a2b0aff1fb64215e2 100644 (file)
--- a/bin/tests/system/staticstub/ns4/named.conf
+++ b/bin/tests/system/staticstub/ns4/named.conf
@@ -12,7 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: named.conf,v 1.2 2010/12/16 09:51:29 jinmei Exp $
+# $Id: named.conf,v 1.3 2010/12/17 00:57:39 marka Exp $
 
 controls { /* empty */ };
 
@@ -30,20 +30,20 @@ options {
 
 zone "example.com" {
        type master;
-       file "example.com.zone";
+       file "example.com.db";
 };
 
 zone "example.org" {
        type master;
-       file "example.org.zone";
+       file "example.org.db";
 };
 
 zone "sub.example" {
        type master;
-       file "sub.example.zone.signed";
+       file "sub.example.db.signed";
 };
 
 zone "example.info" {
        type master;
-       file "example.info.zone";
+       file "example.info.db";
 };

diff --git a/bin/tests/system/staticstub/ns4/sign.sh b/bin/tests/system/staticstub/ns4/sign.sh
index 939602dd4227009fcbd44e4cb447917afdc894d8..3ee4821824b8dfdf4c660d9188c04bec2b24065c 100755 (executable)
--- a/bin/tests/system/staticstub/ns4/sign.sh
+++ b/bin/tests/system/staticstub/ns4/sign.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: sign.sh,v 1.2 2010/12/16 09:51:29 jinmei Exp $
+# $Id: sign.sh,v 1.3 2010/12/17 00:57:39 marka Exp $
 
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh
@@ -22,8 +22,8 @@ SYSTEMTESTTOP=../..
 RANDFILE=../random.data
 
 zone=sub.example
-infile=${zone}.zone.in
-zonefile=${zone}.zone
+infile=${zone}.db.in
+zonefile=${zone}.db
 
 keyname1=`$KEYGEN -q -r $RANDFILE -a NSEC3RSASHA1 -b 768 -n zone $zone`
 keyname2=`$KEYGEN -q -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -f KSK -n zone $zone`

diff --git a/bin/tests/system/staticstub/ns4/sub.example.zone.in b/bin/tests/system/staticstub/ns4/sub.example.db.in
similarity index 94%
rename from bin/tests/system/staticstub/ns4/sub.example.zone.in
rename to bin/tests/system/staticstub/ns4/sub.example.db.in
index cba987a786ad80040a54aa4f4e3203c062507b43..8382b4031117e6025b772acf88f279fbef7df2a4 100644 (file)
--- a/bin/tests/system/staticstub/ns4/sub.example.zone.in
+++ b/bin/tests/system/staticstub/ns4/sub.example.db.in
@@ -12,7 +12,7 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: sub.example.zone.in,v 1.2 2010/12/16 09:51:29 jinmei Exp $
+; $Id: sub.example.db.in,v 1.1 2010/12/17 00:57:39 marka Exp $
 
 $ORIGIN .
 $TTL 300       ; 5 minutes

diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh
index 734b5b2a00504f7f91765daa21f09b5274f40d14..6c93ea4896a2318162460a0d2ea3865f7bab9aa4 100755 (executable)
--- a/bin/tests/system/staticstub/setup.sh
+++ b/bin/tests/system/staticstub/setup.sh
@@ -14,11 +14,11 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: setup.sh,v 1.2 2010/12/16 09:51:27 jinmei Exp $
+# $Id: setup.sh,v 1.3 2010/12/17 00:57:38 marka Exp $
 
 sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' ns2/named.conf.in > ns2/named.conf
 
-sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.zone.signed"; };/' ns3/named.conf.in > ns3/named.conf
+sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.signed"; };/' ns3/named.conf.in > ns3/named.conf
 
 ../../../tools/genrandom 400 random.data
 

diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh
index 6044beb4175880e31843ed1fb4e7cd4f1108083a..016e2572d063e08e9f743b8120d22f1ab5005ca7 100755 (executable)
--- a/bin/tests/system/staticstub/tests.sh
+++ b/bin/tests/system/staticstub/tests.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: tests.sh,v 1.2 2010/12/16 09:51:27 jinmei Exp $
+# $Id: tests.sh,v 1.3 2010/12/17 00:57:38 marka Exp $
 
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
@@ -111,7 +111,7 @@ $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reload 2>&1 | sed 's/^/I:ns3 /
 $DIG +tcp data2.sub.example. @10.53.0.2 txt -p 5300 > dig.out.ns2.test2.$n || ret=1
 grep "2nd sub test data" dig.out.ns2.test2.$n > /dev/null || ret=1
 # re-enable the parent
-sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.zone.signed"; };/' ns3/named.conf.in > ns3/named.conf
+sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.signed"; };/' ns3/named.conf.in > ns3/named.conf
 $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reload 2>&1 | sed 's/^/I:ns3 /'
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`