ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

.zone -> .db

Browse Source
This commit is contained in:
Mark Andrews
2010-12-17 00:57:39 +00:00
parent 8a40052676
commit 273757406a
15 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/tests/system/staticstub/clean.sh
View File

@@ -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.*

4
bin/tests/system/staticstub/ns1/named.conf
View File

@@ -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"; };

2
bin/tests/system/staticstub/ns1/root.zone → bin/tests/system/staticstub/ns1/root.db
View File

@@ -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 )

2
bin/tests/system/staticstub/ns3/example.zone.in → bin/tests/system/staticstub/ns3/example.db.in
View File

@@ -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

2
bin/tests/system/staticstub/ns3/example.org.zone → bin/tests/system/staticstub/ns3/example.org.db
View File

@@ -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

4
bin/tests/system/staticstub/ns3/named.conf.in
View File

@@ -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";
};

6
bin/tests/system/staticstub/ns3/sign.sh
View File

@@ -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 )

2
bin/tests/system/staticstub/ns4/example.com.zone → bin/tests/system/staticstub/ns4/example.com.db
View File

@@ -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

2
bin/tests/system/staticstub/ns4/example.info.zone → bin/tests/system/staticstub/ns4/example.info.db
View File

@@ -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

2
bin/tests/system/staticstub/ns4/example.org.zone → bin/tests/system/staticstub/ns4/example.org.db
View File

@@ -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

10
bin/tests/system/staticstub/ns4/named.conf
View File

@@ -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";
};

6
bin/tests/system/staticstub/ns4/sign.sh
View File

@@ -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`

2
bin/tests/system/staticstub/ns4/sub.example.zone.in → bin/tests/system/staticstub/ns4/sub.example.db.in
View File

@@ -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

4
bin/tests/system/staticstub/setup.sh
View File

@@ -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

4
bin/tests/system/staticstub/tests.sh
View File

@@ -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`