Commit 99f467f0 authored by Andreas Gustafsson's avatar Andreas Gustafsson

test the ixfr-from-differences option

parent 8cccaeae
example. 86400 IN SOA ns2.example. hostmaster.example. 1397051953 5 5 1814400 3600
example. 3600 IN NS ns2.example.
example. 3600 IN NS ns3.example.
a01.example. 3600 IN A 0.0.0.1
a02.example. 3600 IN A 255.255.255.255
a601.example. 3600 IN A6 0 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
a601.example. 3600 IN A6 64 ::ffff:ffff:ffff:ffff foo.
a601.example. 3600 IN A6 127 ::1 foo.
a601.example. 3600 IN A6 128 .
afsdb01.example. 3600 IN AFSDB 0 hostname.example.
afsdb02.example. 3600 IN AFSDB 65535 .
cert01.example. 3600 IN CERT 65534 65535 PRIVATEOID MxFcby9k/yvedMfQgKzhH5er0Mu/vILz45IkskceFGgiWCn/GxHhai6V AuHAoNUz4YoU1tVfSCSqQYn6//11U6Nld80jEeC8aTrO+KKmCaY=
cname01.example. 3600 IN CNAME cname-target.
cname02.example. 3600 IN CNAME cname-target.example.
cname03.example. 3600 IN CNAME .
dname01.example. 3600 IN DNAME dname-target.
dname02.example. 3600 IN DNAME dname-target.example.
dname03.example. 3600 IN DNAME .
gpos01.example. 3600 IN GPOS "-22.6882" "116.8652" "250.0"
gpos02.example. 3600 IN GPOS "" "" ""
hinfo01.example. 3600 IN HINFO "Generic PC clone" "NetBSD-1.4"
hinfo02.example. 3600 IN HINFO "PC" "NetBSD"
isdn01.example. 3600 IN ISDN "isdn-address"
isdn02.example. 3600 IN ISDN "isdn-address" "subaddress"
isdn03.example. 3600 IN ISDN "isdn-address"
isdn04.example. 3600 IN ISDN "isdn-address" "subaddress"
key01.example. 3600 IN KEY 512 255 1 AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aRyzWZriO6i2od GWWQVucZqKVsENW91IOW4vqudngPZsY3GvQ/xVA8/7pyFj6b7Esga60z yGW6LFe9r8n6paHrlG5ojqf0BaqHT+8=
kx01.example. 3600 IN KX 10 kdc.example.
kx02.example. 3600 IN KX 10 .
loc01.example. 3600 IN LOC 60 9 0.000 N 24 39 0.000 E 10.00m 20m 2000m 20m
loc02.example. 3600 IN LOC 60 9 0.000 N 24 39 0.000 E 10.00m 20m 2000m 20m
mb01.example. 3600 IN MG madname.example.
mb02.example. 3600 IN MG .
md01.example. 3600 IN MD .
md01.example. 3600 IN MD madname.example.
mf01.example. 3600 IN MF .
mf01.example. 3600 IN MF madname.example.
mg01.example. 3600 IN MG mgmname.example.
mg02.example. 3600 IN MG .
minfo01.example. 3600 IN MINFO rmailbx.example. emailbx.example.
minfo02.example. 3600 IN MINFO . .
mr01.example. 3600 IN MR mrname.example.
mr02.example. 3600 IN MR .
mx01.example. 3600 IN MX 10 mail.example.
mx02.example. 3600 IN MX 10 .
naptr01.example. 3600 IN NAPTR 0 0 "" "" "" .
naptr02.example. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "blegh" foo.
ns2.example. 3600 IN A 10.53.0.2
ns3.example. 3600 IN A 10.53.0.3
nsap-ptr01.example. 3600 IN NSAP-PTR .
nsap-ptr01.example. 3600 IN NSAP-PTR foo.
nsap01.example. 3600 IN NSAP 0x47000580005a0000000001e133ffffff00016100
nsap02.example. 3600 IN NSAP 0x47000580005a0000000001e133ffffff00016100
nxt01.example. 3600 IN NXT a.secure.nil. NS SOA MX SIG KEY LOC NXT
nxt02.example. 3600 IN NXT . NSAP-PTR NXT
nxt03.example. 3600 IN NXT . A
nxt04.example. 3600 IN NXT . 127
ptr01.example. 3600 IN PTR example.
px01.example. 3600 IN PX 65535 foo. bar.
px02.example. 3600 IN PX 65535 . .
rp01.example. 3600 IN RP mbox-dname.example. txt-dname.example.
rp02.example. 3600 IN RP . .
rt01.example. 3600 IN RT 0 intermediate-host.example.
rt02.example. 3600 IN RT 65535 .
sig01.example. 3600 IN SIG NXT 1 3 3600 20000102030405 19961211100908 2143 foo.nil. MxFcby9k/yvedMfQgKzhH5er0Mu/vILz45IkskceFGgiWCn/GxHhai6V AuHAoNUz4YoU1tVfSCSqQYn6//11U6Nld80jEeC8aTrO+KKmCaY=
srv01.example. 3600 IN SRV 0 0 0 .
srv02.example. 3600 IN SRV 65535 65535 65535 old-slow-box.example.
txt01.example. 3600 IN TXT "foo"
txt02.example. 3600 IN TXT "foo" "bar"
txt03.example. 3600 IN TXT "foo"
txt04.example. 3600 IN TXT "foo" "bar"
txt05.example. 3600 IN TXT "foo bar"
txt06.example. 3600 IN TXT "foo bar"
txt07.example. 3600 IN TXT "foo bar"
txt08.example. 3600 IN TXT "foo\010bar"
txt09.example. 3600 IN TXT "foo\010bar"
txt10.example. 3600 IN TXT "foo bar"
txt11.example. 3600 IN TXT "\"foo\""
txt12.example. 3600 IN TXT "\"foo\""
wks01.example. 3600 IN WKS 10.0.0.1 6 0 1 2 21 23
wks02.example. 3600 IN WKS 10.0.0.1 17 0 1 2 53
wks03.example. 3600 IN WKS 10.0.0.2 6 65535
x2501.example. 3600 IN X25 "123456789"
example. 86400 IN SOA ns2.example. hostmaster.example. 1397051953 5 5 1814400 3600
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
; $Id: root.db,v 1.6 2001/01/09 21:45:48 bwelling Exp $ ; $Id: root.db,v 1.7 2001/09/08 00:24:29 gson Exp $
$TTL 300 $TTL 300
. IN SOA gson.nominum.com. a.root.servers.nil. ( . IN SOA gson.nominum.com. a.root.servers.nil. (
...@@ -28,3 +28,6 @@ a.root-servers.nil. A 10.53.0.1 ...@@ -28,3 +28,6 @@ a.root-servers.nil. A 10.53.0.1
example. NS ns2.example. example. NS ns2.example.
ns2.example. A 10.53.0.2 ns2.example. A 10.53.0.2
tsigzone. NS ns2.tsigzone.
ns2.tsigzone. A 10.53.0.2
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: named.conf,v 1.15 2001/01/11 20:42:07 gson Exp $ */ /* $Id: named.conf,v 1.16 2001/09/08 00:24:30 gson Exp $ */
options { options {
query-source address 10.53.0.2; query-source address 10.53.0.2;
...@@ -27,8 +27,11 @@ options { ...@@ -27,8 +27,11 @@ options {
listen-on-v6 { none; }; listen-on-v6 { none; };
recursion no; recursion no;
notify yes; notify yes;
ixfr-from-differences yes;
}; };
include "../../common/controls.conf";
key tsigzone. { key tsigzone. {
algorithm hmac-md5; algorithm hmac-md5;
secret "1234abcd8765"; secret "1234abcd8765";
...@@ -42,7 +45,6 @@ zone "." { ...@@ -42,7 +45,6 @@ zone "." {
zone "example" { zone "example" {
type master; type master;
file "example.db"; file "example.db";
allow-update { any; };
}; };
zone "tsigzone" { zone "tsigzone" {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: named.conf,v 1.15 2001/01/11 20:42:09 gson Exp $ */ /* $Id: named.conf,v 1.16 2001/09/08 00:24:31 gson Exp $ */
options { options {
query-source address 10.53.0.3; query-source address 10.53.0.3;
...@@ -29,6 +29,15 @@ options { ...@@ -29,6 +29,15 @@ options {
notify yes; notify yes;
}; };
key rndc_key {
secret "1234abcd8765";
algorithm hmac-md5;
};
controls {
inet 10.53.0.3 port 9953 allow { any; } keys { rndc_key; };
};
key tsigzone. { key tsigzone. {
algorithm hmac-md5; algorithm hmac-md5;
secret "1234abcd8765"; secret "1234abcd8765";
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.25 2001/09/07 23:29:50 gson Exp $ # $Id: tests.sh,v 1.26 2001/09/08 00:24:28 gson Exp $
SYSTEMTESTTOP=.. SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh . $SYSTEMTESTTOP/conf.sh
...@@ -33,9 +33,9 @@ $DIG $DIGOPTS example. \ ...@@ -33,9 +33,9 @@ $DIG $DIGOPTS example. \
@10.53.0.3 axfr -p 5300 > dig.out.ns3 || status=1 @10.53.0.3 axfr -p 5300 > dig.out.ns3 || status=1
grep ";" dig.out.ns3 grep ";" dig.out.ns3
$PERL ../digcomp.pl knowngood.dig.out dig.out.ns2 || status=1 $PERL ../digcomp.pl dig1.good dig.out.ns2 || status=1
$PERL ../digcomp.pl knowngood.dig.out dig.out.ns3 || status=1 $PERL ../digcomp.pl dig1.good dig.out.ns3 || status=1
echo "I:testing TSIG signed zone transfers" echo "I:testing TSIG signed zone transfers"
$DIG $DIGOPTS tsigzone. \ $DIG $DIGOPTS tsigzone. \
...@@ -50,5 +50,29 @@ grep ";" dig.out.ns3 ...@@ -50,5 +50,29 @@ grep ";" dig.out.ns3
$PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1 $PERL ../digcomp.pl dig.out.ns2 dig.out.ns3 || status=1
echo "I:testing ixfr-from-differences"
$PERL -i -p -e '
s/0\.0\.0\.0/0.0.0.1/;
s/1397051952/1397051953/
' ns2/example.db
$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p 9953 reload 2>&1 | sed 's/^/I:ns2 /'
sleep 5
$RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reload 2>&1 | sed 's/^/I:ns3 /'
sleep 5
$DIG $DIGOPTS example. \
@10.53.0.3 axfr -p 5300 > dig.out.ns3 || status=1
grep ";" dig.out.ns3
$PERL ../digcomp.pl dig2.good dig.out.ns3 || status=1
# ns3 has a journal iff it received an IXFR.
test -f ns3/example.bk.jnl || status=1
echo "I:exit status: $status" echo "I:exit status: $status"
exit $status exit $status
...@@ -481,6 +481,7 @@ ...@@ -481,6 +481,7 @@
./bin/tests/system/forward/ns4/named.conf CONF-C 2000,2001 ./bin/tests/system/forward/ns4/named.conf CONF-C 2000,2001
./bin/tests/system/forward/ns4/root.db X 2000,2001 ./bin/tests/system/forward/ns4/root.db X 2000,2001
./bin/tests/system/forward/tests.sh SH 2000,2001 ./bin/tests/system/forward/tests.sh SH 2000,2001
./bin/tests/system/genzone.sh SH 2001
./bin/tests/system/glue/clean.sh SH 2000,2001 ./bin/tests/system/glue/clean.sh SH 2000,2001
./bin/tests/system/glue/fi.good X 2000,2001 ./bin/tests/system/glue/fi.good X 2000,2001
./bin/tests/system/glue/noglue.good X 2000,2001 ./bin/tests/system/glue/noglue.good X 2000,2001
...@@ -701,14 +702,13 @@ ...@@ -701,14 +702,13 @@
./bin/tests/system/views/setup.sh SH 2000,2001 ./bin/tests/system/views/setup.sh SH 2000,2001
./bin/tests/system/views/tests.sh SH 2000,2001 ./bin/tests/system/views/tests.sh SH 2000,2001
./bin/tests/system/xfer/clean.sh SH 2000,2001 ./bin/tests/system/xfer/clean.sh SH 2000,2001
./bin/tests/system/xfer/knowngood.dig.out X 2000,2001 ./bin/tests/system/xfer/dig1.good X 2000,2001
./bin/tests/system/xfer/dig2.good X 2000,2001
./bin/tests/system/xfer/ns1/.cvsignore X 2000,2001 ./bin/tests/system/xfer/ns1/.cvsignore X 2000,2001
./bin/tests/system/xfer/ns1/named.conf CONF-C 2000,2001 ./bin/tests/system/xfer/ns1/named.conf CONF-C 2000,2001
./bin/tests/system/xfer/ns1/root.db ZONE 2000,2001 ./bin/tests/system/xfer/ns1/root.db ZONE 2000,2001
./bin/tests/system/xfer/ns2/.cvsignore X 2000,2001 ./bin/tests/system/xfer/ns2/.cvsignore X 2000,2001
./bin/tests/system/xfer/ns2/example.db ZONE 2000,2001
./bin/tests/system/xfer/ns2/named.conf CONF-C 2000,2001 ./bin/tests/system/xfer/ns2/named.conf CONF-C 2000,2001
./bin/tests/system/xfer/ns2/tsigzone.db ZONE 2000,2001
./bin/tests/system/xfer/ns3/.cvsignore X 2000,2001 ./bin/tests/system/xfer/ns3/.cvsignore X 2000,2001
./bin/tests/system/xfer/ns3/named.conf CONF-C 2000,2001 ./bin/tests/system/xfer/ns3/named.conf CONF-C 2000,2001
./bin/tests/system/xfer/tests.sh SH 2000,2001 ./bin/tests/system/xfer/tests.sh SH 2000,2001
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment