diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2007-09-07 14:16:02 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2007-09-07 14:16:02 -0600 |
| commit | 7cbf4ca408d1a8a75016320a7c086c7b5d5ac417 (patch) | |
| tree | 0c1bf9c9fed816aed26da403fa781a9c406587d0 /bin/tests/system | |
| parent | a6794e2b5c31b3fe4619f4eca08d52f375e7184d (diff) | |
| download | bind9-7cbf4ca408d1a8a75016320a7c086c7b5d5ac417.tar.gz | |
9.4.0a5
Diffstat (limited to 'bin/tests/system')
317 files changed, 2034 insertions, 325 deletions
diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in index 10a934b9..96945199 100644 --- a/bin/tests/system/Makefile.in +++ b/bin/tests/system/Makefile.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.24.12.4 2004/03/08 04:04:32 marka Exp $ +# $Id: Makefile.in,v 1.27 2004/03/05 04:59:11 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/system/README b/bin/tests/system/README index 480fa7f0..be79650d 100644 --- a/bin/tests/system/README +++ b/bin/tests/system/README @@ -51,4 +51,4 @@ The tests can be run individually like this: To run all the tests, just type "make test". -$Id: README,v 1.9.4.2.10.1 2004/03/08 04:04:32 marka Exp $ +$Id: README,v 1.12 2004/03/05 04:59:12 marka Exp $ diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh index 6acc4535..e05c512d 100644 --- a/bin/tests/system/cacheclean/clean.sh +++ b/bin/tests/system/cacheclean/clean.sh @@ -15,7 +15,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.206.1 2004/03/06 10:21:49 marka Exp $ +# $Id: clean.sh,v 1.3 2004/03/05 04:59:16 marka Exp $ # # Clean up after cache cleaner tests. diff --git a/bin/tests/system/cacheclean/ns1/example.db b/bin/tests/system/cacheclean/ns1/example.db index ae123871..a83dadcc 100644 --- a/bin/tests/system/cacheclean/ns1/example.db +++ b/bin/tests/system/cacheclean/ns1/example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.2.206.1 2004/03/06 10:21:49 marka Exp $ +; $Id: example.db,v 1.3 2004/03/05 04:59:19 marka Exp $ $TTL 999999 $ORIGIN . diff --git a/bin/tests/system/cacheclean/ns1/named.conf b/bin/tests/system/cacheclean/ns1/named.conf index 46cc174e..c96a00ba 100644 --- a/bin/tests/system/cacheclean/ns1/named.conf +++ b/bin/tests/system/cacheclean/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.206.2 2004/03/06 10:21:49 marka Exp $ */ +/* $Id: named.conf,v 1.4.18.3 2005/08/25 00:05:43 marka Exp $ */ controls { /* empty */ }; @@ -29,6 +29,7 @@ options { listen-on-v6 { none; }; recursion no; notify yes; + check-integrity no; }; zone "." { diff --git a/bin/tests/system/cacheclean/ns2/named.conf b/bin/tests/system/cacheclean/ns2/named.conf index 772e22e1..4d53fa52 100644 --- a/bin/tests/system/cacheclean/ns2/named.conf +++ b/bin/tests/system/cacheclean/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.206.2 2004/03/06 10:21:49 marka Exp $ */ +/* $Id: named.conf,v 1.4.18.2 2005/09/06 03:47:15 marka Exp $ */ controls { /* empty */ }; @@ -29,6 +29,7 @@ options { listen-on-v6 { none; }; notify yes; max-cache-size 10000; + disable-empty-zone 127.IN-ADDR.ARPA; }; zone "." { diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh index 5fb3ffd2..eabd4732 100644 --- a/bin/tests/system/cacheclean/tests.sh +++ b/bin/tests/system/cacheclean/tests.sh @@ -15,7 +15,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.206.1 2004/03/06 10:21:49 marka Exp $ +# $Id: tests.sh,v 1.3 2004/03/05 04:59:16 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/checkconf/bad.conf b/bin/tests/system/checkconf/bad.conf index da7b081a..1e85c5c3 100644 --- a/bin/tests/system/checkconf/bad.conf +++ b/bin/tests/system/checkconf/bad.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: bad.conf,v 1.2.4.1 2005/06/23 07:49:58 marka Exp $ */ +/* $Id: bad.conf,v 1.2.2.1 2005/06/23 07:04:31 marka Exp $ */ options { avoid-v4-udp-ports { 100; } diff --git a/bin/tests/system/checkconf/good.conf b/bin/tests/system/checkconf/good.conf index efe777e1..efa1f59b 100644 --- a/bin/tests/system/checkconf/good.conf +++ b/bin/tests/system/checkconf/good.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: good.conf,v 1.2.4.1 2005/06/23 07:49:59 marka Exp $ */ +/* $Id: good.conf,v 1.2.2.1 2005/06/23 07:04:31 marka Exp $ */ /* * This is just a random selection of configuration options. diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh index 4054c386..0f5203e3 100644 --- a/bin/tests/system/checkconf/tests.sh +++ b/bin/tests/system/checkconf/tests.sh @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.1.4.1 2005/06/23 07:49:59 marka Exp $ +# $Id: tests.sh,v 1.1.2.1 2005/06/23 07:04:31 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh index 3ec7b716..e50636b6 100644 --- a/bin/tests/system/checknames/clean.sh +++ b/bin/tests/system/checknames/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.2.3 2004/03/09 04:23:43 marka Exp $ +# $Id: clean.sh,v 1.3 2004/03/05 04:59:26 marka Exp $ rm -f dig.out.ns?.test* rm -f nsupdate.out.test* diff --git a/bin/tests/system/checknames/ns1/fail.example.db.in b/bin/tests/system/checknames/ns1/fail.example.db.in index 3d1ba6c0..9df458a0 100644 --- a/bin/tests/system/checknames/ns1/fail.example.db.in +++ b/bin/tests/system/checknames/ns1/fail.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: fail.example.db.in,v 1.2.2.2 2004/03/06 10:21:51 marka Exp $ +; $Id: fail.example.db.in,v 1.3 2004/03/05 04:59:37 marka Exp $ $TTL 300 @ SOA ns1.fail.example. hostmaster.fail.example. ( diff --git a/bin/tests/system/checknames/ns1/fail.update.db.in b/bin/tests/system/checknames/ns1/fail.update.db.in index b11026f3..300ff754 100644 --- a/bin/tests/system/checknames/ns1/fail.update.db.in +++ b/bin/tests/system/checknames/ns1/fail.update.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: fail.update.db.in,v 1.2.2.2 2004/03/06 10:21:51 marka Exp $ +; $Id: fail.update.db.in,v 1.3 2004/03/05 04:59:37 marka Exp $ $TTL 300 @ SOA ns1.fail.update. hostmaster.fail.update. ( diff --git a/bin/tests/system/checknames/ns1/ignore.example.db.in b/bin/tests/system/checknames/ns1/ignore.example.db.in index cbf48357..20383572 100644 --- a/bin/tests/system/checknames/ns1/ignore.example.db.in +++ b/bin/tests/system/checknames/ns1/ignore.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: ignore.example.db.in,v 1.2.2.2 2004/03/06 10:21:51 marka Exp $ +; $Id: ignore.example.db.in,v 1.3 2004/03/05 04:59:37 marka Exp $ $TTL 300 @ SOA ns1.ignore.example. hostmaster.ignore.example. ( diff --git a/bin/tests/system/checknames/ns1/ignore.update.db.in b/bin/tests/system/checknames/ns1/ignore.update.db.in index 2262ba3e..697dc7ee 100644 --- a/bin/tests/system/checknames/ns1/ignore.update.db.in +++ b/bin/tests/system/checknames/ns1/ignore.update.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: ignore.update.db.in,v 1.2.2.2 2004/03/06 10:21:51 marka Exp $ +; $Id: ignore.update.db.in,v 1.3 2004/03/05 04:59:38 marka Exp $ $TTL 300 @ SOA ns1.ignore.update. hostmaster.ignore.update. ( diff --git a/bin/tests/system/checknames/ns1/named.conf b/bin/tests/system/checknames/ns1/named.conf index 1d6a63e2..08118a54 100644 --- a/bin/tests/system/checknames/ns1/named.conf +++ b/bin/tests/system/checknames/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.2.3 2004/03/06 10:21:51 marka Exp $ */ +/* $Id: named.conf,v 1.4.18.3 2005/08/25 00:05:43 marka Exp $ */ controls { /* empty */ }; @@ -28,6 +28,7 @@ options { listen-on-v6 { none; }; recursion no; notify yes; + check-integrity no; }; zone "." { diff --git a/bin/tests/system/checknames/ns1/root.db b/bin/tests/system/checknames/ns1/root.db index b96aed94..e75064e9 100644 --- a/bin/tests/system/checknames/ns1/root.db +++ b/bin/tests/system/checknames/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.db,v 1.2.2.2 2004/03/06 10:21:52 marka Exp $ +; $Id: root.db,v 1.3 2004/03/05 04:59:38 marka Exp $ $TTL 300 @ SOA ns1. hostmaster.warn.example. ( diff --git a/bin/tests/system/checknames/ns1/warn.example.db.in b/bin/tests/system/checknames/ns1/warn.example.db.in index deeb602f..8e127380 100644 --- a/bin/tests/system/checknames/ns1/warn.example.db.in +++ b/bin/tests/system/checknames/ns1/warn.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: warn.example.db.in,v 1.2.2.2 2004/03/06 10:21:52 marka Exp $ +; $Id: warn.example.db.in,v 1.3 2004/03/05 04:59:38 marka Exp $ $TTL 300 @ SOA ns1.warn.example. hostmaster.warn.example. ( diff --git a/bin/tests/system/checknames/ns1/warn.update.db.in b/bin/tests/system/checknames/ns1/warn.update.db.in index ca7fda6f..e1028a32 100644 --- a/bin/tests/system/checknames/ns1/warn.update.db.in +++ b/bin/tests/system/checknames/ns1/warn.update.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: warn.update.db.in,v 1.2.2.2 2004/03/06 10:21:52 marka Exp $ +; $Id: warn.update.db.in,v 1.3 2004/03/05 04:59:38 marka Exp $ $TTL 300 @ SOA ns1.warn.update. hostmaster.warn.update. ( diff --git a/bin/tests/system/checknames/ns2/named.conf b/bin/tests/system/checknames/ns2/named.conf index 0070961e..c167d3ad 100644 --- a/bin/tests/system/checknames/ns2/named.conf +++ b/bin/tests/system/checknames/ns2/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.2.3 2004/03/06 10:21:52 marka Exp $ */ +/* $Id: named.conf,v 1.4 2004/03/05 04:59:41 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/checknames/ns2/root.hints b/bin/tests/system/checknames/ns2/root.hints index 4f5921b1..7d584532 100644 --- a/bin/tests/system/checknames/ns2/root.hints +++ b/bin/tests/system/checknames/ns2/root.hints @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hints,v 1.2.2.2 2004/03/06 10:21:52 marka Exp $ +; $Id: root.hints,v 1.3 2004/03/05 04:59:41 marka Exp $ $TTL 300 . NS ns1. diff --git a/bin/tests/system/checknames/ns3/named.conf b/bin/tests/system/checknames/ns3/named.conf index a84ff3f1..601368c1 100644 --- a/bin/tests/system/checknames/ns3/named.conf +++ b/bin/tests/system/checknames/ns3/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.2.3 2004/03/06 10:21:53 marka Exp $ */ +/* $Id: named.conf,v 1.4 2004/03/05 04:59:45 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/checknames/ns3/root.hints b/bin/tests/system/checknames/ns3/root.hints index 9043797e..b3cf3f71 100644 --- a/bin/tests/system/checknames/ns3/root.hints +++ b/bin/tests/system/checknames/ns3/root.hints @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hints,v 1.2.2.2 2004/03/06 10:21:53 marka Exp $ +; $Id: root.hints,v 1.3 2004/03/05 04:59:45 marka Exp $ $TTL 300 . NS ns1. diff --git a/bin/tests/system/checknames/setup.sh b/bin/tests/system/checknames/setup.sh index 11e0b2b6..9c7c1c77 100644 --- a/bin/tests/system/checknames/setup.sh +++ b/bin/tests/system/checknames/setup.sh @@ -12,7 +12,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2.2.2 2004/03/06 10:21:50 marka Exp $ +# $Id: setup.sh,v 1.3 2004/03/05 04:59:26 marka Exp $ cp ns1/ignore.example.db.in ns1/ignore.example.db cp ns1/warn.example.db.in ns1/warn.example.db diff --git a/bin/tests/system/checknames/tests.sh b/bin/tests/system/checknames/tests.sh index f9a210da..3884a265 100644 --- a/bin/tests/system/checknames/tests.sh +++ b/bin/tests/system/checknames/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.2.2 2004/03/06 10:21:50 marka Exp $ +# $Id: tests.sh,v 1.3 2004/03/05 04:59:26 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh index b7563b91..6e0a97f7 100644 --- a/bin/tests/system/cleanall.sh +++ b/bin/tests/system/cleanall.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: cleanall.sh,v 1.8.206.1 2004/03/06 10:21:47 marka Exp $ +# $Id: cleanall.sh,v 1.9 2004/03/05 04:59:12 marka Exp $ # # Clean up after system tests. diff --git a/bin/tests/system/common/controls.conf b/bin/tests/system/common/controls.conf index d63a9d35..c14dd197 100644 --- a/bin/tests/system/common/controls.conf +++ b/bin/tests/system/common/controls.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: controls.conf,v 1.3.206.1 2004/03/06 10:21:53 marka Exp $ */ +/* $Id: controls.conf,v 1.4 2004/03/05 04:59:48 marka Exp $ */ key rndc_key { secret "1234abcd8765"; diff --git a/bin/tests/system/common/rndc.conf b/bin/tests/system/common/rndc.conf index b918ba60..7bc55be6 100644 --- a/bin/tests/system/common/rndc.conf +++ b/bin/tests/system/common/rndc.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.conf,v 1.2.206.1 2004/03/06 10:21:54 marka Exp $ */ +/* $Id: rndc.conf,v 1.3 2004/03/05 04:59:48 marka Exp $ */ options { default-key "rndc_key"; diff --git a/bin/tests/system/common/root.hint b/bin/tests/system/common/root.hint index 2793249a..d3cdb4ce 100644 --- a/bin/tests/system/common/root.hint +++ b/bin/tests/system/common/root.hint @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.2.206.1 2004/03/06 10:21:54 marka Exp $ +; $Id: root.hint,v 1.3 2004/03/05 04:59:48 marka Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index 1bb2586d..96a5f00e 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: conf.sh.in,v 1.23.2.2.4.7 2005/06/24 00:06:55 marka Exp $ +# $Id: conf.sh.in,v 1.27.18.8 2006/03/05 23:58:51 marka Exp $ # # Common configuration data for system tests, to be sourced into @@ -37,17 +37,18 @@ RNDC=$TOP/bin/rndc/rndc NSUPDATE=$TOP/bin/nsupdate/nsupdate KEYGEN=$TOP/bin/dnssec/dnssec-keygen SIGNER=$TOP/bin/dnssec/dnssec-signzone +CHECKZONE=$TOP/bin/check/named-checkzone CHECKCONF=$TOP/bin/check/named-checkconf # The "stress" test is not run by default since it creates enough # load on the machine to make it unusable to other users. # v6synth -SUBDIRS="cacheclean checkconf checknames dnssec forward glue ixfr limits \ - lwresd masterfile notify nsupdate resolver sortlist stub tkey \ - unknown upforwd views xfer xferquota" +SUBDIRS="cacheclean checkconf checknames dnssec forward glue ixfr limits + lwresd masterfile masterformat notify nsupdate resolver rrsetorder + sortlist stub tkey unknown upforwd views xfer xferquota zonechecks" # PERL will be an empty string if no perl interpreter was found. PERL=@PERL@ export NAMED LWRESD DIG NSUPDATE KEYGEN SIGNER KEYSIGNER KEYSETTOOL PERL \ - SUBDIRS RNDC CHECKCONF + SUBDIRS RNDC CHECKZONE diff --git a/bin/tests/system/dialup/ns1/example.db b/bin/tests/system/dialup/ns1/example.db index f49f293f..9f489d38 100644 --- a/bin/tests/system/dialup/ns1/example.db +++ b/bin/tests/system/dialup/ns1/example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.3.206.1 2004/03/06 10:21:55 marka Exp $ +; $Id: example.db,v 1.4 2004/03/05 04:59:57 marka Exp $ @ 3600 SOA hostmaster.ns1 ns1 ( 1 3600 1200 3600000 1200 ) diff --git a/bin/tests/system/dialup/ns1/named.conf b/bin/tests/system/dialup/ns1/named.conf index 10f7b118..1ea41129 100644 --- a/bin/tests/system/dialup/ns1/named.conf +++ b/bin/tests/system/dialup/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4.206.2 2004/03/06 10:21:55 marka Exp $ */ +/* $Id: named.conf,v 1.6 2004/03/05 04:59:58 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/dialup/ns1/root.db b/bin/tests/system/dialup/ns1/root.db index 22d0d88d..afa394a9 100644 --- a/bin/tests/system/dialup/ns1/root.db +++ b/bin/tests/system/dialup/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.3.206.1 2004/03/06 10:21:55 marka Exp $ +; $Id: root.db,v 1.4 2004/03/05 04:59:58 marka Exp $ @ 3600 SOA hostmaster.ns1.example ns1.example ( 1 3600 1200 3600000 1200 ) diff --git a/bin/tests/system/dialup/ns2/hint.db b/bin/tests/system/dialup/ns2/hint.db index 3cea834a..d1ae590e 100644 --- a/bin/tests/system/dialup/ns2/hint.db +++ b/bin/tests/system/dialup/ns2/hint.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: hint.db,v 1.3.206.1 2004/03/06 10:21:55 marka Exp $ +; $Id: hint.db,v 1.4 2004/03/05 05:00:01 marka Exp $ . 1200 NS ns1.example ns1.example A 10.53.0.1 diff --git a/bin/tests/system/dialup/ns2/named.conf b/bin/tests/system/dialup/ns2/named.conf index edffcb1f..b1dacd00 100644 --- a/bin/tests/system/dialup/ns2/named.conf +++ b/bin/tests/system/dialup/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4.206.2 2004/03/06 10:21:56 marka Exp $ */ +/* $Id: named.conf,v 1.6 2004/03/05 05:00:01 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/dialup/ns3/hint.db b/bin/tests/system/dialup/ns3/hint.db index 833927d8..a6c9a7a0 100644 --- a/bin/tests/system/dialup/ns3/hint.db +++ b/bin/tests/system/dialup/ns3/hint.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: hint.db,v 1.3.206.1 2004/03/06 10:21:56 marka Exp $ +; $Id: hint.db,v 1.4 2004/03/05 05:00:04 marka Exp $ . 1200 NS ns1.example ns1.example A 10.53.0.1 diff --git a/bin/tests/system/dialup/ns3/named.conf b/bin/tests/system/dialup/ns3/named.conf index 42e91876..5ee2b680 100644 --- a/bin/tests/system/dialup/ns3/named.conf +++ b/bin/tests/system/dialup/ns3/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.4.206.2 2004/03/06 10:21:56 marka Exp $ */ +/* $Id: named.conf,v 1.6 2004/03/05 05:00:04 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/dialup/setup.sh b/bin/tests/system/dialup/setup.sh index 637e8ecd..4529f58b 100644 --- a/bin/tests/system/dialup/setup.sh +++ b/bin/tests/system/dialup/setup.sh @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.3.206.1 2004/03/06 10:21:54 marka Exp $ +# $Id: setup.sh,v 1.4 2004/03/05 04:59:51 marka Exp $ rm -f ns2/example.bk rm -f ns3/example.bk diff --git a/bin/tests/system/dialup/tests.sh b/bin/tests/system/dialup/tests.sh index f04b7635..64f2dc6f 100644 --- a/bin/tests/system/dialup/tests.sh +++ b/bin/tests/system/dialup/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.3.206.1 2004/03/06 10:21:54 marka Exp $ +# $Id: tests.sh,v 1.4 2004/03/05 04:59:51 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/digcomp.pl b/bin/tests/system/digcomp.pl index d0fc9f55..1873d02f 100644 --- a/bin/tests/system/digcomp.pl +++ b/bin/tests/system/digcomp.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: digcomp.pl,v 1.11.206.1 2004/03/06 10:21:47 marka Exp $ +# $Id: digcomp.pl,v 1.12 2004/03/05 04:59:12 marka Exp $ # Compare two files, each with the output from dig, for differences. # Ignore "unimportant" differences, like ordering of NS lines, TTL's, diff --git a/bin/tests/system/dlv/clean.sh b/bin/tests/system/dlv/clean.sh index e4c9fc90..2b3fdf14 100644 --- a/bin/tests/system/dlv/clean.sh +++ b/bin/tests/system/dlv/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.4.1 2004/05/14 05:20:32 marka Exp $ +# $Id: clean.sh,v 1.2.2.1 2004/05/14 05:19:47 marka Exp $ rm -f random.data rm -f ns*/named.run diff --git a/bin/tests/system/dlv/ns1/named.conf b/bin/tests/system/dlv/ns1/named.conf index 7fdfe16a..07290d10 100644 --- a/bin/tests/system/dlv/ns1/named.conf +++ b/bin/tests/system/dlv/ns1/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.4.1 2004/05/14 05:20:35 marka Exp $ */ +/* $Id: named.conf,v 1.2.2.1 2004/05/14 05:19:51 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/dlv/ns1/root.db b/bin/tests/system/dlv/ns1/root.db index 38c8b6c9..1b3cd47a 100644 --- a/bin/tests/system/dlv/ns1/root.db +++ b/bin/tests/system/dlv/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.db,v 1.2.4.1 2004/05/14 05:20:36 marka Exp $ +; $Id: root.db,v 1.2.2.1 2004/05/14 05:19:53 marka Exp $ $TTL 120 @ SOA ns.rootservers.utld hostmaster.ns.rootservers.utld ( diff --git a/bin/tests/system/dlv/ns1/rootservers.utld.db b/bin/tests/system/dlv/ns1/rootservers.utld.db index 6b76ee4b..69869757 100644 --- a/bin/tests/system/dlv/ns1/rootservers.utld.db +++ b/bin/tests/system/dlv/ns1/rootservers.utld.db @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: rootservers.utld.db,v 1.2.4.1 2004/05/14 05:20:38 marka Exp $ +; $Id: rootservers.utld.db,v 1.2.2.1 2004/05/14 05:19:54 marka Exp $ $TTL 120 @ SOA ns hostmaster.ns 1 3600 1200 604800 60 diff --git a/bin/tests/system/dlv/ns2/hints b/bin/tests/system/dlv/ns2/hints index f947c1c7..0981e4a6 100644 --- a/bin/tests/system/dlv/ns2/hints +++ b/bin/tests/system/dlv/ns2/hints @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: hints,v 1.2.4.1 2004/05/14 05:20:39 marka Exp $ +; $Id: hints,v 1.2.2.1 2004/05/14 05:19:55 marka Exp $ . 0 NS ns.rootservers.utld. ns.rootservers.utld. 0 A 10.53.0.1 diff --git a/bin/tests/system/dlv/ns2/named.conf b/bin/tests/system/dlv/ns2/named.conf index f773d619..ab3e029f 100644 --- a/bin/tests/system/dlv/ns2/named.conf +++ b/bin/tests/system/dlv/ns2/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.4.1 2004/05/14 05:20:40 marka Exp $ */ +/* $Id: named.conf,v 1.2.2.1 2004/05/14 05:19:56 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/dlv/ns2/utld.db b/bin/tests/system/dlv/ns2/utld.db index 6d6b1080..3f6f18b4 100644 --- a/bin/tests/system/dlv/ns2/utld.db +++ b/bin/tests/system/dlv/ns2/utld.db @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: utld.db,v 1.2.4.1 2004/05/14 05:20:41 marka Exp $ +; $Id: utld.db,v 1.2.2.1 2004/05/14 05:19:57 marka Exp $ $TTL 120 @ SOA ns hostmaster.ns 1 3600 1200 604800 60 diff --git a/bin/tests/system/dlv/ns3/child.db.in b/bin/tests/system/dlv/ns3/child.db.in index 910c21e6..3f090917 100644 --- a/bin/tests/system/dlv/ns3/child.db.in +++ b/bin/tests/system/dlv/ns3/child.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: child.db.in,v 1.2.4.1 2004/05/14 05:20:42 marka Exp $ +; $Id: child.db.in,v 1.2.2.1 2004/05/14 05:19:59 marka Exp $ $TTL 120 @ SOA ns hostmaster.ns 1 3600 1200 604800 60 diff --git a/bin/tests/system/dlv/ns3/dlv.db.in b/bin/tests/system/dlv/ns3/dlv.db.in index 5a9e6e15..ba1f0744 100644 --- a/bin/tests/system/dlv/ns3/dlv.db.in +++ b/bin/tests/system/dlv/ns3/dlv.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: dlv.db.in,v 1.2.4.1 2004/05/14 05:20:42 marka Exp $ +; $Id: dlv.db.in,v 1.2.2.1 2004/05/14 05:20:00 marka Exp $ $TTL 120 @ SOA ns hostmaster.ns 1 3600 1200 604800 60 diff --git a/bin/tests/system/dlv/ns3/hints b/bin/tests/system/dlv/ns3/hints index 165e65a9..051be706 100644 --- a/bin/tests/system/dlv/ns3/hints +++ b/bin/tests/system/dlv/ns3/hints @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: hints,v 1.2.4.1 2004/05/14 05:20:43 marka Exp $ +; $Id: hints,v 1.2.2.1 2004/05/14 05:20:01 marka Exp $ . 0 NS ns.rootservers.utld. ns.rootservers.utld. 0 A 10.53.0.1 diff --git a/bin/tests/system/dlv/ns3/named.conf b/bin/tests/system/dlv/ns3/named.conf index b66a6716..f6b6237e 100644 --- a/bin/tests/system/dlv/ns3/named.conf +++ b/bin/tests/system/dlv/ns3/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.4.1 2004/05/14 05:20:44 marka Exp $ */ +/* $Id: named.conf,v 1.2.2.1 2004/05/14 05:20:02 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh index ef2ea1c7..3e79b2fc 100755 --- a/bin/tests/system/dlv/ns3/sign.sh +++ b/bin/tests/system/dlv/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.4.1 2004/05/14 05:20:45 marka Exp $ +# $Id: sign.sh,v 1.2.2.1 2004/05/14 05:20:03 marka Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/dlv/ns4/child.db b/bin/tests/system/dlv/ns4/child.db index dad79ba7..68b8bdff 100644 --- a/bin/tests/system/dlv/ns4/child.db +++ b/bin/tests/system/dlv/ns4/child.db @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: child.db,v 1.2.4.1 2004/05/14 05:20:46 marka Exp $ +; $Id: child.db,v 1.2.2.1 2004/05/14 05:20:04 marka Exp $ $TTL 120 @ SOA ns hostmaster.ns 1 3600 1200 604800 60 diff --git a/bin/tests/system/dlv/ns4/hints b/bin/tests/system/dlv/ns4/hints index fd7ac94a..e88a6b1c 100644 --- a/bin/tests/system/dlv/ns4/hints +++ b/bin/tests/system/dlv/ns4/hints @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: hints,v 1.2.4.1 2004/05/14 05:20:47 marka Exp $ +; $Id: hints,v 1.2.2.1 2004/05/14 05:20:05 marka Exp $ . 0 NS ns.rootservers.utld. ns.rootservers.utld. 0 A 10.53.0.1 diff --git a/bin/tests/system/dlv/ns4/named.conf b/bin/tests/system/dlv/ns4/named.conf index 0cb9eb71..16f15ab6 100644 --- a/bin/tests/system/dlv/ns4/named.conf +++ b/bin/tests/system/dlv/ns4/named.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.4.1 2004/05/14 05:20:47 marka Exp $ */ +/* $Id: named.conf,v 1.2.2.1 2004/05/14 05:20:07 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/dlv/ns5/hints b/bin/tests/system/dlv/ns5/hints index 2e839d37..f272f371 100644 --- a/bin/tests/system/dlv/ns5/hints +++ b/bin/tests/system/dlv/ns5/hints @@ -12,7 +12,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: hints,v 1.2.4.1 2004/05/14 05:20:49 marka Exp $ +; $Id: hints,v 1.2.2.1 2004/05/14 05:20:08 marka Exp $ . 0 NS ns.rootservers.utld. ns.rootservers.utld. 0 A 10.53.0.1 diff --git a/bin/tests/system/dlv/ns5/named.conf b/bin/tests/system/dlv/ns5/named.conf index 22126ba7..71e56951 100644 --- a/bin/tests/system/dlv/ns5/named.conf +++ b/bin/tests/system/dlv/ns5/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.4.2 2004/06/04 02:32:56 marka Exp $ */ +/* $Id: named.conf,v 1.2.2.4 2006/03/10 00:23:20 marka Exp $ */ /* * Choose a keyname that is unlikely to clash with any real key names. @@ -58,6 +58,7 @@ options { recursion yes; notify yes; dnssec-enable yes; + dnssec-validation yes; dnssec-lookaside "." trust-anchor "dlv.utld"; }; diff --git a/bin/tests/system/dlv/ns5/rndc.conf b/bin/tests/system/dlv/ns5/rndc.conf index ad169e0e..4a71846d 100644 --- a/bin/tests/system/dlv/ns5/rndc.conf +++ b/bin/tests/system/dlv/ns5/rndc.conf @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: rndc.conf,v 1.2.4.2 2004/08/19 04:40:58 marka Exp $ */ +/* $Id: rndc.conf,v 1.2.2.2 2004/08/19 04:42:36 marka Exp $ */ key "cc64b3d1db63fc88d7cb5d2f9f57d258" { algorithm hmac-md5; diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh index bc6740e3..55cd1d24 100644 --- a/bin/tests/system/dlv/setup.sh +++ b/bin/tests/system/dlv/setup.sh @@ -14,7 +14,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2.4.1 2004/05/14 05:20:33 marka Exp $ +# $Id: setup.sh,v 1.2.2.1 2004/05/14 05:19:48 marka Exp $ ../../genrandom 400 random.data diff --git a/bin/tests/system/dlv/tests.sh b/bin/tests/system/dlv/tests.sh index 68e83e10..578fa1c3 100644 --- a/bin/tests/system/dlv/tests.sh +++ b/bin/tests/system/dlv/tests.sh @@ -14,6 +14,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.2.4.1 2004/05/14 05:20:34 marka Exp $ +# $Id: tests.sh,v 1.2.2.1 2004/05/14 05:19:49 marka Exp $ exit 0 diff --git a/bin/tests/system/dnssec/README b/bin/tests/system/dnssec/README index e4bdad1b..63ea49a8 100644 --- a/bin/tests/system/dnssec/README +++ b/bin/tests/system/dnssec/README @@ -2,7 +2,7 @@ Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") Copyright (C) 2000-2002 Internet Software Consortium. See COPYRIGHT in the source root or http://isc.org/copyright.html for terms. -$Id: README,v 1.5.12.3 2004/03/08 04:04:33 marka Exp $ +$Id: README,v 1.8 2004/03/05 05:00:08 marka Exp $ The test setup for the DNSSEC tests has a secure root. diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh index bed867dc..962aae15 100644 --- a/bin/tests/system/dnssec/clean.sh +++ b/bin/tests/system/dnssec/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.10.12.7 2005/09/13 00:34:53 marka Exp $ +# $Id: clean.sh,v 1.15.18.2 2005/06/24 00:08:12 marka Exp $ rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp* rm -f ns1/root.db ns2/example.db ns3/secure.example.db diff --git a/bin/tests/system/dnssec/dnssec_update_test.pl b/bin/tests/system/dnssec/dnssec_update_test.pl index 89a60dfd..41e613a9 100644 --- a/bin/tests/system/dnssec/dnssec_update_test.pl +++ b/bin/tests/system/dnssec/dnssec_update_test.pl @@ -32,7 +32,7 @@ # # perl -MCPAN -e "install Net::DNS" # -# $Id: dnssec_update_test.pl,v 1.3.2.1 2004/03/08 02:07:44 marka Exp $ +# $Id: dnssec_update_test.pl,v 1.3 2004/03/05 05:00:09 marka Exp $ # use Getopt::Std; diff --git a/bin/tests/system/dnssec/ns1/named.conf b/bin/tests/system/dnssec/ns1/named.conf index 40d6aea0..85da5ad0 100644 --- a/bin/tests/system/dnssec/ns1/named.conf +++ b/bin/tests/system/dnssec/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.16.206.4 2004/03/10 02:55:53 marka Exp $ */ +/* $Id: named.conf,v 1.20.18.2 2006/03/10 00:23:20 marka Exp $ */ // NS1 @@ -32,6 +32,7 @@ options { recursion no; notify yes; dnssec-enable yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/dnssec/ns1/root.db.in b/bin/tests/system/dnssec/ns1/root.db.in index 3cc6b84e..a7b7b311 100644 --- a/bin/tests/system/dnssec/ns1/root.db.in +++ b/bin/tests/system/dnssec/ns1/root.db.in @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db.in,v 1.6.206.2 2004/03/10 02:55:54 marka Exp $ +; $Id: root.db.in,v 1.8 2004/03/10 02:19:53 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh index c6c72eff..43748b44 100644 --- a/bin/tests/system/dnssec/ns1/sign.sh +++ b/bin/tests/system/dnssec/ns1/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.12.12.4 2004/03/10 02:55:54 marka Exp $ +# $Id: sign.sh,v 1.19.18.2 2006/01/04 00:37:23 marka Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh @@ -31,7 +31,7 @@ zonefile=root.db cp ../ns2/keyset-example. . cp ../ns2/keyset-dlv. . -keyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $zone` +keyname=`$KEYGEN -r $RANDFILE -a RSAMD5 -b 768 -n zone $zone` cat $infile $keyname.key > $zonefile diff --git a/bin/tests/system/dnssec/ns2/dlv.db.in b/bin/tests/system/dnssec/ns2/dlv.db.in index afeab7a0..15af7fab 100644 --- a/bin/tests/system/dnssec/ns2/dlv.db.in +++ b/bin/tests/system/dnssec/ns2/dlv.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: dlv.db.in,v 1.1.4.2 2004/08/19 04:41:06 marka Exp $ +; $Id: dlv.db.in,v 1.2.18.1 2004/08/19 04:42:43 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns2/dst.example.db.in b/bin/tests/system/dnssec/ns2/dst.example.db.in index 8a5e6e21..09434dc6 100644 --- a/bin/tests/system/dnssec/ns2/dst.example.db.in +++ b/bin/tests/system/dnssec/ns2/dst.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: dst.example.db.in,v 1.2.2.1 2004/03/08 02:07:45 marka Exp $ +; $Id: dst.example.db.in,v 1.2 2004/03/05 05:00:15 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns2/example.db.in b/bin/tests/system/dnssec/ns2/example.db.in index 80254b1a..40d46fa5 100644 --- a/bin/tests/system/dnssec/ns2/example.db.in +++ b/bin/tests/system/dnssec/ns2/example.db.in @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db.in,v 1.8.12.5 2004/05/05 01:32:15 marka Exp $ +; $Id: example.db.in,v 1.13.18.2 2004/05/05 01:32:35 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns2/insecure.secure.example.db b/bin/tests/system/dnssec/ns2/insecure.secure.example.db index c09c3bd3..87f8e607 100644 --- a/bin/tests/system/dnssec/ns2/insecure.secure.example.db +++ b/bin/tests/system/dnssec/ns2/insecure.secure.example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: insecure.secure.example.db,v 1.6.206.1 2004/03/06 10:22:00 marka Exp $ +; $Id: insecure.secure.example.db,v 1.7 2004/03/05 05:00:15 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns2/named.conf b/bin/tests/system/dnssec/ns2/named.conf index 359a579d..8acdc776 100644 --- a/bin/tests/system/dnssec/ns2/named.conf +++ b/bin/tests/system/dnssec/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.17.12.6 2004/05/05 01:32:15 marka Exp $ */ +/* $Id: named.conf,v 1.23.18.3 2006/03/10 00:23:20 marka Exp $ */ // NS2 @@ -32,6 +32,7 @@ options { recursion no; notify yes; dnssec-enable yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/dnssec/ns2/private.secure.example.db.in b/bin/tests/system/dnssec/ns2/private.secure.example.db.in index 41378138..438587e4 100644 --- a/bin/tests/system/dnssec/ns2/private.secure.example.db.in +++ b/bin/tests/system/dnssec/ns2/private.secure.example.db.in @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: private.secure.example.db.in,v 1.6.206.2 2004/03/08 02:07:45 marka Exp $ +; $Id: private.secure.example.db.in,v 1.8 2004/03/05 05:00:16 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh index b07b54fd..123dad79 100644 --- a/bin/tests/system/dnssec/ns2/sign.sh +++ b/bin/tests/system/dnssec/ns2/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.15.12.4 2004/03/10 02:55:54 marka Exp $ +# $Id: sign.sh,v 1.24.18.2 2006/01/04 00:37:23 marka Exp $ SYSTEMTESTTOP=../.. . $SYSTEMTESTTOP/conf.sh @@ -48,7 +48,7 @@ privzone=private.secure.example. privinfile=private.secure.example.db.in privzonefile=private.secure.example.db -privkeyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $privzone` +privkeyname=`$KEYGEN -r $RANDFILE -a RSAMD5 -b 768 -n zone $privzone` cat $privinfile $privkeyname.key >$privzonefile @@ -61,7 +61,7 @@ dlvzone=dlv. dlvinfile=dlv.db.in dlvzonefile=dlv.db -dlvkeyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $dlvzone` +dlvkeyname=`$KEYGEN -r $RANDFILE -a RSAMD5 -b 768 -n zone $dlvzone` cat $dlvinfile $dlvkeyname.key dlvset-$privzone > $dlvzonefile diff --git a/bin/tests/system/dnssec/ns3/bogus.example.db.in b/bin/tests/system/dnssec/ns3/bogus.example.db.in index dc5060e4..e1c800b9 100644 --- a/bin/tests/system/dnssec/ns3/bogus.example.db.in +++ b/bin/tests/system/dnssec/ns3/bogus.example.db.in @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: bogus.example.db.in,v 1.6.206.1 2004/03/06 10:22:01 marka Exp $ +; $Id: bogus.example.db.in,v 1.7 2004/03/05 05:00:20 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns3/dynamic.example.db.in b/bin/tests/system/dnssec/ns3/dynamic.example.db.in index 0f9e0594..5f079d9a 100644 --- a/bin/tests/system/dnssec/ns3/dynamic.example.db.in +++ b/bin/tests/system/dnssec/ns3/dynamic.example.db.in @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: dynamic.example.db.in,v 1.3.2.1 2004/03/08 02:07:46 marka Exp $ +; $Id: dynamic.example.db.in,v 1.3 2004/03/05 05:00:20 marka Exp $ ; This has the NS and glue at the apex because testing RT #2399 ; requires we have only one name in the zone at a certain point diff --git a/bin/tests/system/dnssec/ns3/insecure.example.db b/bin/tests/system/dnssec/ns3/insecure.example.db index 4930e28d..12027d8e 100644 --- a/bin/tests/system/dnssec/ns3/insecure.example.db +++ b/bin/tests/system/dnssec/ns3/insecure.example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: insecure.example.db,v 1.6.206.1 2004/03/06 10:22:01 marka Exp $ +; $Id: insecure.example.db,v 1.7 2004/03/05 05:00:20 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns3/keyless.example.db.in b/bin/tests/system/dnssec/ns3/keyless.example.db.in index a8920b03..735ca394 100644 --- a/bin/tests/system/dnssec/ns3/keyless.example.db.in +++ b/bin/tests/system/dnssec/ns3/keyless.example.db.in @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: keyless.example.db.in,v 1.3.2.1 2004/03/08 02:07:46 marka Exp $ +; $Id: keyless.example.db.in,v 1.3 2004/03/05 05:00:20 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns3/named.conf b/bin/tests/system/dnssec/ns3/named.conf index 96150349..e66b1890 100644 --- a/bin/tests/system/dnssec/ns3/named.conf +++ b/bin/tests/system/dnssec/ns3/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.18.12.7 2004/05/05 01:32:16 marka Exp $ */ +/* $Id: named.conf,v 1.25.18.4 2006/03/10 00:23:20 marka Exp $ */ // NS3 @@ -32,6 +32,7 @@ options { recursion no; notify yes; dnssec-enable yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/dnssec/ns3/secure.example.db.in b/bin/tests/system/dnssec/ns3/secure.example.db.in index 67540b0a..f5d2ca6e 100644 --- a/bin/tests/system/dnssec/ns3/secure.example.db.in +++ b/bin/tests/system/dnssec/ns3/secure.example.db.in @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: secure.example.db.in,v 1.8.206.1 2004/03/06 10:22:02 marka Exp $ +; $Id: secure.example.db.in,v 1.9 2004/03/05 05:00:21 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh index b5b4debf..2a4ca707 100644 --- a/bin/tests/system/dnssec/ns3/sign.sh +++ b/bin/tests/system/dnssec/ns3/sign.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: sign.sh,v 1.12.12.3 2004/03/08 04:04:35 marka Exp $ +# $Id: sign.sh,v 1.18.18.3 2006/03/06 01:38:00 marka Exp $ RANDFILE=../random.data @@ -33,7 +33,7 @@ zone=bogus.example. infile=bogus.example.db.in zonefile=bogus.example.db -keyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $zone` +keyname=`$KEYGEN -r $RANDFILE -a RSAMD5 -b 768 -n zone $zone` cat $infile $keyname.key >$zonefile @@ -43,9 +43,10 @@ zone=dynamic.example. infile=dynamic.example.db.in zonefile=dynamic.example.db -keyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $zone` +keyname1=`$KEYGEN -r $RANDFILE -a RSAMD5 -b 768 -n zone $zone` +keyname2=`$KEYGEN -r $RANDFILE -a RSAMD5 -b 1024 -n zone -f KSK $zone` -cat $infile $keyname.key >$zonefile +cat $infile $keyname1.key $keyname2.key >$zonefile $SIGNER -r $RANDFILE -o $zone $zonefile > /dev/null @@ -53,7 +54,7 @@ zone=keyless.example. infile=keyless.example.db.in zonefile=keyless.example.db -keyname=`$KEYGEN -r $RANDFILE -a RSA -b 768 -n zone $zone` +keyname=`$KEYGEN -r $RANDFILE -a RSAMD5 -b 768 -n zone $zone` cat $infile $keyname.key >$zonefile diff --git a/bin/tests/system/dnssec/ns4/named.conf b/bin/tests/system/dnssec/ns4/named.conf index a1defb96..07cccc81 100644 --- a/bin/tests/system/dnssec/ns4/named.conf +++ b/bin/tests/system/dnssec/ns4/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.18.206.5 2004/04/15 23:56:26 marka Exp $ */ +/* $Id: named.conf,v 1.22.18.3 2006/03/10 00:23:20 marka Exp $ */ // NS4 @@ -31,6 +31,7 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-enable yes; + dnssec-validation yes; dnssec-must-be-secure mustbesecure.example yes; }; diff --git a/bin/tests/system/dnssec/ns5/named.conf b/bin/tests/system/dnssec/ns5/named.conf index 6ccbe8c9..d5f27e0a 100644 --- a/bin/tests/system/dnssec/ns5/named.conf +++ b/bin/tests/system/dnssec/ns5/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.16.206.4 2004/03/10 02:55:55 marka Exp $ */ +/* $Id: named.conf,v 1.20.18.2 2006/03/10 00:23:20 marka Exp $ */ // NS5 @@ -31,6 +31,7 @@ options { listen-on-v6 { none; }; recursion yes; dnssec-enable yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/dnssec/ns5/trusted.conf.bad b/bin/tests/system/dnssec/ns5/trusted.conf.bad index 9dfc7590..128f994a 100644 --- a/bin/tests/system/dnssec/ns5/trusted.conf.bad +++ b/bin/tests/system/dnssec/ns5/trusted.conf.bad @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: trusted.conf.bad,v 1.6.206.1 2004/03/06 10:22:03 marka Exp $ */ +/* $Id: trusted.conf.bad,v 1.7 2004/03/05 05:00:31 marka Exp $ */ trusted-keys { "." 256 3 1 "AQO6Cl+slAf+iuieDim9L3kujFHQD7s/IOj03ClMOpKYcTXtK4mRpuULVfvWxDi9Ew/gj0xLnnX7z9OJHIxLI+DSrAHd8Dm0XfBEAtVtJSn70GaPZgnLMw1rk5ap2DsEoWk="; diff --git a/bin/tests/system/dnssec/ns6/named.conf b/bin/tests/system/dnssec/ns6/named.conf index f5282d74..31ae011f 100644 --- a/bin/tests/system/dnssec/ns6/named.conf +++ b/bin/tests/system/dnssec/ns6/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.5.2.3 2004/06/04 02:32:57 marka Exp $ */ +/* $Id: named.conf,v 1.6.18.3 2006/03/10 00:23:20 marka Exp $ */ // NS6 @@ -32,6 +32,7 @@ options { notify yes; disable-algorithms . { DSA; }; dnssec-enable yes; + dnssec-validation yes; dnssec-lookaside . trust-anchor dlv; }; diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh index 2d88bb83..6f4daa5d 100644 --- a/bin/tests/system/dnssec/prereq.sh +++ b/bin/tests/system/dnssec/prereq.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2000-2002 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,11 +15,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.3.2.2.8.2 2004/12/08 06:13:02 marka Exp $ +# $Id: prereq.sh,v 1.5.18.3 2006/01/04 00:37:23 marka Exp $ ../../genrandom 400 random.data -if $KEYGEN -a RSA -b 512 -n zone -r random.data foo > /dev/null 2>&1 +if $KEYGEN -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1 then rm -f Kfoo* else diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh index 43b22fd0..7338f89e 100644 --- a/bin/tests/system/dnssec/setup.sh +++ b/bin/tests/system/dnssec/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.10.206.2 2004/03/10 01:05:51 marka Exp $ +# $Id: setup.sh,v 1.12 2004/03/10 01:06:04 marka Exp $ ../../genrandom 400 random.data diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index a43c8e25..8ad85b04 100644 --- a/bin/tests/system/dnssec/tests.sh +++ b/bin/tests/system/dnssec/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.33.12.10 2006/02/26 23:49:48 marka Exp $ +# $Id: tests.sh,v 1.44.18.5 2006/02/26 23:49:49 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh @@ -446,7 +446,7 @@ status=`expr $status + $ret` # grand parent and there is not a secure delegation from secure.example # to private.secure.example. In addition secure.example is using a # algorithm which the validation does not support. -# +# echo "I:checking dnssec-lookaside-validation works ($n)" ret=0 $DIG $DIGOPTS private.secure.example. SOA @10.53.0.6 \ diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh index 991b8336..912fb08f 100644 --- a/bin/tests/system/forward/clean.sh +++ b/bin/tests/system/forward/clean.sh @@ -13,7 +13,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.206.1 2004/03/06 10:22:03 marka Exp $ +# $Id: clean.sh,v 1.3 2004/03/05 05:00:38 marka Exp $ # # Clean up after forward tests. diff --git a/bin/tests/system/forward/ns1/named.conf b/bin/tests/system/forward/ns1/named.conf index 785cf808..f4432621 100644 --- a/bin/tests/system/forward/ns1/named.conf +++ b/bin/tests/system/forward/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.7.206.2 2004/03/06 10:22:04 marka Exp $ */ +/* $Id: named.conf,v 1.9 2004/03/05 05:00:43 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/forward/ns1/root.db b/bin/tests/system/forward/ns1/root.db index fe150630..40e45ebc 100644 --- a/bin/tests/system/forward/ns1/root.db +++ b/bin/tests/system/forward/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.1.214.1 2004/03/08 04:04:36 marka Exp $ +; $Id: root.db,v 1.2 2004/03/05 12:46:13 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/forward/ns2/named.conf b/bin/tests/system/forward/ns2/named.conf index ba0441b8..452d4fe4 100644 --- a/bin/tests/system/forward/ns2/named.conf +++ b/bin/tests/system/forward/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.7.206.2 2004/03/06 10:22:04 marka Exp $ */ +/* $Id: named.conf,v 1.9 2004/03/05 05:00:46 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/forward/ns2/root.db b/bin/tests/system/forward/ns2/root.db index fe150630..40e45ebc 100644 --- a/bin/tests/system/forward/ns2/root.db +++ b/bin/tests/system/forward/ns2/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.1.214.1 2004/03/08 04:04:36 marka Exp $ +; $Id: root.db,v 1.2 2004/03/05 12:46:13 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/forward/ns3/named.conf b/bin/tests/system/forward/ns3/named.conf index e4765e2e..7ed8bd35 100644 --- a/bin/tests/system/forward/ns3/named.conf +++ b/bin/tests/system/forward/ns3/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.7.206.2 2004/03/06 10:22:04 marka Exp $ */ +/* $Id: named.conf,v 1.9 2004/03/05 05:00:49 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/forward/ns3/root.db b/bin/tests/system/forward/ns3/root.db index fe150630..40e45ebc 100644 --- a/bin/tests/system/forward/ns3/root.db +++ b/bin/tests/system/forward/ns3/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.1.214.1 2004/03/08 04:04:36 marka Exp $ +; $Id: root.db,v 1.2 2004/03/05 12:46:13 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/forward/ns4/named.conf b/bin/tests/system/forward/ns4/named.conf index 074d40dc..9a775376 100644 --- a/bin/tests/system/forward/ns4/named.conf +++ b/bin/tests/system/forward/ns4/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.7.206.2 2004/03/06 10:22:05 marka Exp $ */ +/* $Id: named.conf,v 1.9 2004/03/05 05:00:52 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/forward/ns4/root.db b/bin/tests/system/forward/ns4/root.db index 17814444..1f9703ed 100644 --- a/bin/tests/system/forward/ns4/root.db +++ b/bin/tests/system/forward/ns4/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.1.214.1 2004/03/08 04:04:37 marka Exp $ +; $Id: root.db,v 1.2 2004/03/05 12:46:14 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh index e6b8f9ae..69442920 100644 --- a/bin/tests/system/forward/tests.sh +++ b/bin/tests/system/forward/tests.sh @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.4.206.1 2004/03/06 10:22:03 marka Exp $ +# $Id: tests.sh,v 1.5 2004/03/05 05:00:38 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/genzone.sh b/bin/tests/system/genzone.sh index 0c87b5d6..8ade6c2b 100644 --- a/bin/tests/system/genzone.sh +++ b/bin/tests/system/genzone.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: genzone.sh,v 1.3.202.4 2004/03/08 04:04:33 marka Exp $ +# $Id: genzone.sh,v 1.6 2004/03/05 04:59:12 marka Exp $ # # Set up a test zone diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh index a6b33bf6..531f31cd 100644 --- a/bin/tests/system/glue/clean.sh +++ b/bin/tests/system/glue/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.5.206.1 2004/03/06 10:22:05 marka Exp $ +# $Id: clean.sh,v 1.6 2004/03/05 05:00:55 marka Exp $ # # Clean up after glue tests. diff --git a/bin/tests/system/glue/ns1/cache.in b/bin/tests/system/glue/ns1/cache.in index e6f04063..cc6df1ed 100644 --- a/bin/tests/system/glue/ns1/cache.in +++ b/bin/tests/system/glue/ns1/cache.in @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: cache.in,v 1.1.206.1 2004/03/06 10:22:05 marka Exp $ +; $Id: cache.in,v 1.2 2004/03/05 05:00:58 marka Exp $ ; Preloaded cache data for glue test diff --git a/bin/tests/system/glue/ns1/mil.db b/bin/tests/system/glue/ns1/mil.db index 6b33519d..ec4a1a75 100644 --- a/bin/tests/system/glue/ns1/mil.db +++ b/bin/tests/system/glue/ns1/mil.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: mil.db,v 1.5.206.1 2004/03/06 10:22:06 marka Exp $ +; $Id: mil.db,v 1.6 2004/03/05 05:00:58 marka Exp $ $ORIGIN mil. $TTL 300 diff --git a/bin/tests/system/glue/ns1/named.conf b/bin/tests/system/glue/ns1/named.conf index e5dc8cde..a880708f 100644 --- a/bin/tests/system/glue/ns1/named.conf +++ b/bin/tests/system/glue/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.8.206.2 2004/03/06 10:22:06 marka Exp $ */ +/* $Id: named.conf,v 1.10.18.3 2005/08/25 00:05:44 marka Exp $ */ controls { /* empty */ }; @@ -30,6 +30,7 @@ options { recursion no; notify no; cache-file "cache"; + check-integrity no; }; zone "." { diff --git a/bin/tests/system/glue/ns1/net.db b/bin/tests/system/glue/ns1/net.db index 94d1296b..2f4e64bb 100644 --- a/bin/tests/system/glue/ns1/net.db +++ b/bin/tests/system/glue/ns1/net.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: net.db,v 1.5.206.1 2004/03/06 10:22:06 marka Exp $ +; $Id: net.db,v 1.6 2004/03/05 05:00:58 marka Exp $ $ORIGIN net. $TTL 300 diff --git a/bin/tests/system/glue/ns1/root-servers.nil.db b/bin/tests/system/glue/ns1/root-servers.nil.db index c4713552..cf155813 100644 --- a/bin/tests/system/glue/ns1/root-servers.nil.db +++ b/bin/tests/system/glue/ns1/root-servers.nil.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root-servers.nil.db,v 1.4.206.1 2004/03/06 10:22:06 marka Exp $ +; $Id: root-servers.nil.db,v 1.5 2004/03/05 05:00:59 marka Exp $ $TTL 300 @ IN SOA ns hostmaster ( diff --git a/bin/tests/system/glue/ns1/root.db b/bin/tests/system/glue/ns1/root.db index 512994c4..2ec17b6f 100644 --- a/bin/tests/system/glue/ns1/root.db +++ b/bin/tests/system/glue/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.4.206.1 2004/03/06 10:22:06 marka Exp $ +; $Id: root.db,v 1.5 2004/03/05 05:00:59 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh index 90295927..0ab8d59a 100644 --- a/bin/tests/system/glue/setup.sh +++ b/bin/tests/system/glue/setup.sh @@ -15,6 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2.206.2 2004/03/10 01:05:52 marka Exp $ +# $Id: setup.sh,v 1.4 2004/03/10 01:06:04 marka Exp $ cd ns1 && cp -f cache.in cache diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh index c74873da..4d1896d8 100644 --- a/bin/tests/system/glue/tests.sh +++ b/bin/tests/system/glue/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.5.206.2 2004/03/06 10:22:05 marka Exp $ +# $Id: tests.sh,v 1.7 2004/03/05 05:00:55 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/ifconfig.sh b/bin/tests/system/ifconfig.sh index 13170a77..948ad76f 100755 --- a/bin/tests/system/ifconfig.sh +++ b/bin/tests/system/ifconfig.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: ifconfig.sh,v 1.35.2.8.2.8 2004/10/05 03:18:16 marka Exp $ +# $Id: ifconfig.sh,v 1.46.18.3 2004/10/05 03:18:21 marka Exp $ # # Set up interface aliases for bind9 system tests. diff --git a/bin/tests/system/ixfr/ans2/ans.pl b/bin/tests/system/ixfr/ans2/ans.pl index b082358b..66111b0d 100644 --- a/bin/tests/system/ixfr/ans2/ans.pl +++ b/bin/tests/system/ixfr/ans2/ans.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: ans.pl,v 1.2.206.1 2004/03/06 10:22:08 marka Exp $ +# $Id: ans.pl,v 1.3 2004/03/05 05:01:06 marka Exp $ # # This is the name server from hell. It provides canned diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh index 00d051cc..86ee8162 100644 --- a/bin/tests/system/ixfr/clean.sh +++ b/bin/tests/system/ixfr/clean.sh @@ -15,6 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.2.206.1 2004/03/06 10:22:07 marka Exp $ +# $Id: clean.sh,v 1.3 2004/03/05 05:01:02 marka Exp $ rm -f ns1/named.conf ns1/myftp.db diff --git a/bin/tests/system/ixfr/prereq.sh b/bin/tests/system/ixfr/prereq.sh index 3d253610..bc3ef375 100644 --- a/bin/tests/system/ixfr/prereq.sh +++ b/bin/tests/system/ixfr/prereq.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.2.206.1 2004/03/06 10:22:07 marka Exp $ +# $Id: prereq.sh,v 1.3 2004/03/05 05:01:02 marka Exp $ if $PERL -e 'use Net::DNS;' 2>/dev/null then diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh index 262ea9d4..a130302f 100644 --- a/bin/tests/system/ixfr/setup.sh +++ b/bin/tests/system/ixfr/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.1.206.1 2004/03/06 10:22:07 marka Exp $ +# $Id: setup.sh,v 1.2 2004/03/05 05:01:02 marka Exp $ rm -f ns1/*.db ns1/*.jnl diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh index 6acf8f60..36282a3e 100644 --- a/bin/tests/system/ixfr/tests.sh +++ b/bin/tests/system/ixfr/tests.sh @@ -15,7 +15,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.206.1 2004/03/06 10:22:07 marka Exp $ +# $Id: tests.sh,v 1.3 2004/03/05 05:01:02 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh index bb6aa79d..4edbba15 100644 --- a/bin/tests/system/limits/clean.sh +++ b/bin/tests/system/limits/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.7.206.1 2004/03/06 10:22:08 marka Exp $ +# $Id: clean.sh,v 1.8 2004/03/05 05:01:09 marka Exp $ # # Clean up after limits tests. diff --git a/bin/tests/system/limits/ns1/example.db b/bin/tests/system/limits/ns1/example.db index 947423d0..2da00ef8 100644 --- a/bin/tests/system/limits/ns1/example.db +++ b/bin/tests/system/limits/ns1/example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.7.206.1 2004/03/06 10:22:09 marka Exp $ +; $Id: example.db,v 1.8 2004/03/05 05:01:13 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA ns1.example. hostmaster.example. ( diff --git a/bin/tests/system/limits/ns1/named.conf b/bin/tests/system/limits/ns1/named.conf index 534bb108..6338cff2 100644 --- a/bin/tests/system/limits/ns1/named.conf +++ b/bin/tests/system/limits/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.10.206.2 2004/03/06 10:22:09 marka Exp $ */ +/* $Id: named.conf,v 1.12 2004/03/05 05:01:13 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/limits/ns1/root.db b/bin/tests/system/limits/ns1/root.db index 22b8893b..26dffae2 100644 --- a/bin/tests/system/limits/ns1/root.db +++ b/bin/tests/system/limits/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.6.206.1 2004/03/06 10:22:09 marka Exp $ +; $Id: root.db,v 1.7 2004/03/05 05:01:14 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh index 71a2c512..82d8c3ca 100644 --- a/bin/tests/system/limits/tests.sh +++ b/bin/tests/system/limits/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.14.206.1 2004/03/06 10:22:08 marka Exp $ +# $Id: tests.sh,v 1.15 2004/03/05 05:01:09 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in index c30b4397..35f45ea7 100644 --- a/bin/tests/system/lwresd/Makefile.in +++ b/bin/tests/system/lwresd/Makefile.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.12.12.6 2004/07/20 07:01:53 marka Exp $ +# $Id: Makefile.in,v 1.16.18.1 2004/07/20 07:03:24 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/system/lwresd/lwresd1/lwresd.conf b/bin/tests/system/lwresd/lwresd1/lwresd.conf index edcc1867..c69bc63b 100644 --- a/bin/tests/system/lwresd/lwresd1/lwresd.conf +++ b/bin/tests/system/lwresd/lwresd1/lwresd.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwresd.conf,v 1.4.206.2 2004/03/06 10:22:11 marka Exp $ */ +/* $Id: lwresd.conf,v 1.6 2004/03/05 05:01:23 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/lwresd/lwresd1/resolv.conf b/bin/tests/system/lwresd/lwresd1/resolv.conf index 7b2ed3c4..0a12f27b 100644 --- a/bin/tests/system/lwresd/lwresd1/resolv.conf +++ b/bin/tests/system/lwresd/lwresd1/resolv.conf @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: resolv.conf,v 1.8.206.1 2004/03/06 10:22:11 marka Exp $ +# $Id: resolv.conf,v 1.9 2004/03/05 05:01:23 marka Exp $ nameserver 10.53.0.1 lwserver 10.53.0.1 diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c index c21dc018..2781d7e3 100644 --- a/bin/tests/system/lwresd/lwtest.c +++ b/bin/tests/system/lwresd/lwtest.c @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: lwtest.c,v 1.22.2.4.2.4 2004/03/08 04:04:37 marka Exp $ */ +/* $Id: lwtest.c,v 1.26 2004/03/05 05:01:20 marka Exp $ */ #include <config.h> diff --git a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db index fa79dcfa..84989212 100644 --- a/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db +++ b/bin/tests/system/lwresd/ns1/10.10.10.in-addr.arpa.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: 10.10.10.in-addr.arpa.db,v 1.7.206.1 2004/03/06 10:22:11 marka Exp $ +; $Id: 10.10.10.in-addr.arpa.db,v 1.8 2004/03/05 05:01:26 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/example1.db b/bin/tests/system/lwresd/ns1/example1.db index cb4b1b34..3c759b03 100644 --- a/bin/tests/system/lwresd/ns1/example1.db +++ b/bin/tests/system/lwresd/ns1/example1.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example1.db,v 1.10.22.6 2004/03/08 04:04:37 marka Exp $ +; $Id: example1.db,v 1.15 2004/03/05 05:01:26 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/example2.db b/bin/tests/system/lwresd/ns1/example2.db index 9e5ca10e..3bc1d777 100644 --- a/bin/tests/system/lwresd/ns1/example2.db +++ b/bin/tests/system/lwresd/ns1/example2.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example2.db,v 1.6.74.3 2004/03/08 04:04:37 marka Exp $ +; $Id: example2.db,v 1.8 2004/03/05 05:01:27 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/ip6.arpa.db b/bin/tests/system/lwresd/ns1/ip6.arpa.db index de3a9f7e..64b1277b 100644 --- a/bin/tests/system/lwresd/ns1/ip6.arpa.db +++ b/bin/tests/system/lwresd/ns1/ip6.arpa.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: ip6.arpa.db,v 1.7.22.3 2004/03/08 04:04:38 marka Exp $ +; $Id: ip6.arpa.db,v 1.9 2004/03/05 05:01:27 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/ip6.int.db b/bin/tests/system/lwresd/ns1/ip6.int.db index 8c0a01c6..b566a5ac 100644 --- a/bin/tests/system/lwresd/ns1/ip6.int.db +++ b/bin/tests/system/lwresd/ns1/ip6.int.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: ip6.int.db,v 1.7.22.3 2004/03/08 04:04:38 marka Exp $ +; $Id: ip6.int.db,v 1.9 2004/03/05 05:01:27 marka Exp $ $TTL 300 ; 5 minutes @ IN SOA mname1. . ( diff --git a/bin/tests/system/lwresd/ns1/named.conf b/bin/tests/system/lwresd/ns1/named.conf index 8ef6f6ab..e449f2fb 100644 --- a/bin/tests/system/lwresd/ns1/named.conf +++ b/bin/tests/system/lwresd/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.11.206.4 2004/03/10 02:55:56 marka Exp $ */ +/* $Id: named.conf,v 1.15.18.2 2006/03/10 00:23:20 marka Exp $ */ controls { /* empty */ }; @@ -30,6 +30,7 @@ options { recursion no; notify no; dnssec-enable yes; + dnssec-validation yes; }; zone "." { diff --git a/bin/tests/system/lwresd/ns1/root.db b/bin/tests/system/lwresd/ns1/root.db index fec74c46..830161e3 100644 --- a/bin/tests/system/lwresd/ns1/root.db +++ b/bin/tests/system/lwresd/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.6.206.1 2004/03/06 10:22:12 marka Exp $ +; $Id: root.db,v 1.7 2004/03/05 05:01:27 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/lwresd/resolv.conf b/bin/tests/system/lwresd/resolv.conf index 327ce2b3..8262edc0 100644 --- a/bin/tests/system/lwresd/resolv.conf +++ b/bin/tests/system/lwresd/resolv.conf @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: resolv.conf,v 1.8.206.1 2004/03/06 10:22:10 marka Exp $ +# $Id: resolv.conf,v 1.9 2004/03/05 05:01:20 marka Exp $ nameserver 10.53.0.1 lwserver 10.53.0.1 diff --git a/bin/tests/system/lwresd/tests.sh b/bin/tests/system/lwresd/tests.sh index 2c265302..ceb8ca8b 100644 --- a/bin/tests/system/lwresd/tests.sh +++ b/bin/tests/system/lwresd/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.14.206.1 2004/03/06 10:22:10 marka Exp $ +# $Id: tests.sh,v 1.15 2004/03/05 05:01:20 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh index 75559a77..894c571e 100644 --- a/bin/tests/system/masterfile/clean.sh +++ b/bin/tests/system/masterfile/clean.sh @@ -15,6 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.1.206.1 2004/03/06 10:22:13 marka Exp $ +# $Id: clean.sh,v 1.2 2004/03/05 05:01:30 marka Exp $ rm -f dig.out diff --git a/bin/tests/system/masterfile/knowngood.dig.out b/bin/tests/system/masterfile/knowngood.dig.out index 60478dc7..56de5550 100644 --- a/bin/tests/system/masterfile/knowngood.dig.out +++ b/bin/tests/system/masterfile/knowngood.dig.out @@ -19,6 +19,7 @@ c.ttl2. 2 IN TXT "inherited ttl 2" d.ttl2. 3 IN TXT "default ttl 3" e.ttl2. 2 IN TXT "explicit ttl 2" f.ttl2. 3 IN TXT "default ttl 3" +ns.ttl2. 1 IN A 10.53.0.1 ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3 ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3 ttl2. 1 IN NS ns.ttl2. @@ -28,4 +29,5 @@ c.ttl2. 2 IN TXT "inherited ttl 2" d.ttl2. 3 IN TXT "default ttl 3" e.ttl2. 2 IN TXT "explicit ttl 2" f.ttl2. 3 IN TXT "default ttl 3" +ns.ttl2. 1 IN A 10.53.0.1 ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3 diff --git a/bin/tests/system/masterfile/ns1/include.db b/bin/tests/system/masterfile/ns1/include.db index ed4ed3e9..9c80bfe0 100644 --- a/bin/tests/system/masterfile/ns1/include.db +++ b/bin/tests/system/masterfile/ns1/include.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: include.db,v 1.2.206.1 2004/03/06 10:22:13 marka Exp $ +; $Id: include.db,v 1.3 2004/03/05 05:01:35 marka Exp $ ; Test $INCLUDE current domain name and origin semantics diff --git a/bin/tests/system/masterfile/ns1/named.conf b/bin/tests/system/masterfile/ns1/named.conf index a4a7cd2f..71ed13c4 100644 --- a/bin/tests/system/masterfile/ns1/named.conf +++ b/bin/tests/system/masterfile/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.206.2 2004/03/06 10:22:13 marka Exp $ */ +/* $Id: named.conf,v 1.4 2004/03/05 05:01:35 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/masterfile/ns1/sub.db b/bin/tests/system/masterfile/ns1/sub.db index 6d989bff..41ffe8c7 100644 --- a/bin/tests/system/masterfile/ns1/sub.db +++ b/bin/tests/system/masterfile/ns1/sub.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: sub.db,v 1.2.206.1 2004/03/06 10:22:14 marka Exp $ +; $Id: sub.db,v 1.3 2004/03/05 05:01:35 marka Exp $ a A 10.0.1.1 $ORIGIN foo diff --git a/bin/tests/system/masterfile/ns1/ttl1.db b/bin/tests/system/masterfile/ns1/ttl1.db index fd9012fd..5b5e1931 100644 --- a/bin/tests/system/masterfile/ns1/ttl1.db +++ b/bin/tests/system/masterfile/ns1/ttl1.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: ttl1.db,v 1.2.206.1 2004/03/06 10:22:14 marka Exp $ +; $Id: ttl1.db,v 1.3.18.1 2004/11/23 05:24:44 marka Exp $ @ IN SOA ns hostmaster ( 1 ; serial @@ -23,6 +23,7 @@ 3 ) NS ns +ns A 10.53.0.1 a TXT "soa minttl 3" b 2 TXT "explicit ttl 2" c TXT "soa minttl 3" diff --git a/bin/tests/system/masterfile/ns1/ttl2.db b/bin/tests/system/masterfile/ns1/ttl2.db index 20fb3ca0..5b192338 100644 --- a/bin/tests/system/masterfile/ns1/ttl2.db +++ b/bin/tests/system/masterfile/ns1/ttl2.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: ttl2.db,v 1.2.206.1 2004/03/06 10:22:14 marka Exp $ +; $Id: ttl2.db,v 1.3.18.1 2004/11/23 05:24:44 marka Exp $ @ 1 IN SOA ns hostmaster ( 1 ; serial @@ -23,6 +23,7 @@ 3 ) NS ns +ns A 10.53.0.1 a TXT "inherited ttl 1" b 2 TXT "explicit ttl 2" c TXT "inherited ttl 2" diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh index d8c7fe5e..064013ae 100644 --- a/bin/tests/system/masterfile/tests.sh +++ b/bin/tests/system/masterfile/tests.sh @@ -15,7 +15,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.206.1 2004/03/06 10:22:13 marka Exp $ +# $Id: tests.sh,v 1.3 2004/03/05 05:01:30 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh new file mode 100755 index 00000000..f43fe3e8 --- /dev/null +++ b/bin/tests/system/masterformat/clean.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# +# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: clean.sh,v 1.2.2.1 2005/06/20 01:19:29 marka Exp $ + +rm -f named-compilezone +rm -f ns1/example.db.raw +rm -f ns2/example.db +rm -f dig.out.* diff --git a/bin/tests/system/masterformat/ns1/compile.sh b/bin/tests/system/masterformat/ns1/compile.sh new file mode 100755 index 00000000..f8ad5063 --- /dev/null +++ b/bin/tests/system/masterformat/ns1/compile.sh @@ -0,0 +1,17 @@ +# Copyright (C) 2005, 2006 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: compile.sh,v 1.2.2.3 2006/01/07 00:23:34 marka Exp $ + +../named-compilezone -D -F raw -o example.db.raw example example.db diff --git a/bin/tests/system/masterformat/ns1/example.db b/bin/tests/system/masterformat/ns1/example.db new file mode 100644 index 00000000..2c0a50e8 --- /dev/null +++ b/bin/tests/system/masterformat/ns1/example.db @@ -0,0 +1,54 @@ +; Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: example.db,v 1.2.2.2 2005/06/22 00:13:09 marka Exp $ + +$TTL 1D + +@ IN SOA ns hostmaster ( + 1 + 3600 + 1800 + 1814400 + 3 + ) + NS ns +ns A 10.53.0.1 +mx MX 10 mail +a A 10.53.0.1 + A 10.53.0.2 +aaaa AAAA 2001:db8::53 +cname CNAME cname-target +dname DNAME dname-target +txt TXT "this is text" + +;; +;; we are not testing DNSSEC behavior, so we don't care about the semantics +;; of the following records. +dnskey 300 DNSKEY 256 3 1 ( + AQPTpWyReB/e9Ii6mVGnakS8hX2zkh/iUYAg + +Ge4noWROpTWOIBvm76zeJPWs4Zfqa1IsswD + Ix5Mqeg0zwclz59uecKsKyx5w9IhtZ8plc4R + b9VIE5x7KNHAYTvTO5d4S8M= + ) +ds 300 DS 30795 1 1 ( + 310D27F4D82C1FC2400704EA9939FE6E1CEA + A3B9 ) +nsec 600 NSEC nsecnext NS DS RRSIG NSEC +rrsig 300 RRSIG SOA 1 0 300 20050714214747 ( + 20050614214747 30795 . + yi/RRPAQmn6rnjDQaCqVValBa+ICF00ZldKf + ZSDaoew5mMUh83DlrrPPNeAxrzMSNzDGlJ6P + fdyIFgzPn/CvthF4kjBUAiJTp4r2zhlaUJQ+ + QFo+drYXYgVJo6aA36fj ) diff --git a/bin/tests/system/masterformat/ns1/named.conf b/bin/tests/system/masterformat/ns1/named.conf new file mode 100644 index 00000000..07b7cc6d --- /dev/null +++ b/bin/tests/system/masterformat/ns1/named.conf @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: named.conf,v 1.2.2.1 2005/06/20 01:19:32 marka Exp $ */ + +// NS1 + +controls { /* empty */ }; + +options { + pid-file "named.pid"; + listen-on port 5300 { 10.53.0.1; }; + listen-on-v6 { none; }; + recursion no; + notify no; + dnssec-enable yes; +}; + +zone "example" { + type master; + masterfile-format raw; + file "example.db.raw"; +}; diff --git a/bin/tests/system/masterformat/ns2/named.conf b/bin/tests/system/masterformat/ns2/named.conf new file mode 100644 index 00000000..ca98f796 --- /dev/null +++ b/bin/tests/system/masterformat/ns2/named.conf @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: named.conf,v 1.2.2.1 2005/06/20 01:19:33 marka Exp $ */ + +// NS2 + +controls { /* empty */ }; + +options { + pid-file "named.pid"; + listen-on port 5300 { 10.53.0.2; }; + listen-on-v6 { none; }; + recursion no; + notify no; + dnssec-enable yes; +}; + +zone "example" { + type master; + file "example.db"; +}; diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh new file mode 100755 index 00000000..ecf981bd --- /dev/null +++ b/bin/tests/system/masterformat/setup.sh @@ -0,0 +1,20 @@ +# Copyright (C) 2005, 2006 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: setup.sh,v 1.2.2.3 2006/01/07 00:23:34 marka Exp $ + +ln -s $CHECKZONE named-compilezone +rm -f ns1/example.db.raw +cp ns1/example.db ns2/ +cd ns1 && sh compile.sh diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh new file mode 100755 index 00000000..4e168445 --- /dev/null +++ b/bin/tests/system/masterformat/tests.sh @@ -0,0 +1,80 @@ +#!/bin/sh +# +# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: tests.sh,v 1.2.2.1 2005/06/20 01:19:30 marka Exp $ + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +DIGOPTS="+tcp +noauth +noadd +nosea +nostat +noquest +nocomm +nocmd" + +status=0 + +echo "I:checking that master file in the raw format worked" + +for server in 1 2 +do + for name in ns mx a aaaa cname dname txt rrsig nsec dnskey ds + do + $DIG $DIGOPTS $name.example. $name @10.53.0.$server -p 5300 + echo + done > dig.out.$server +done + +diff dig.out.1 dig.out.2 || status=1 + +echo "I:exit status: $status" +exit $status +#!/bin/sh +# +# Copyright (C) 2005 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: tests.sh,v 1.2.2.1 2005/06/20 01:19:30 marka Exp $ + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +DIGOPTS="+tcp +noauth +noadd +nosea +nostat +noquest +nocomm +nocmd" + +status=0 + +echo "I:checking that master file in the raw format worked" + +for server in 1 2 +do + for name in ns mx a aaaa cname dname txt rrsig nsec dnskey ds + do + $DIG $DIGOPTS $name.example. $name @10.53.0.$server -p 5300 + echo + done > dig.out.$server +done + +diff dig.out.1 dig.out.2 || status=1 + +echo "I:exit status: $status" +exit $status diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh index 8593b6ae..fb43e470 100644 --- a/bin/tests/system/notify/clean.sh +++ b/bin/tests/system/notify/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.7.206.2 2004/03/10 01:05:52 marka Exp $ +# $Id: clean.sh,v 1.9 2004/03/10 01:06:04 marka Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/notify/ns1/named.conf b/bin/tests/system/notify/ns1/named.conf index 9a02f4f1..544e86df 100644 --- a/bin/tests/system/notify/ns1/named.conf +++ b/bin/tests/system/notify/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.14.206.2 2004/03/06 10:22:15 marka Exp $ */ +/* $Id: named.conf,v 1.16 2004/03/05 05:01:43 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/notify/ns1/root.db b/bin/tests/system/notify/ns1/root.db index 1f19427d..db2736e2 100644 --- a/bin/tests/system/notify/ns1/root.db +++ b/bin/tests/system/notify/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.6.206.1 2004/03/06 10:22:15 marka Exp $ +; $Id: root.db,v 1.7 2004/03/05 05:01:44 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/notify/ns2/example1.db b/bin/tests/system/notify/ns2/example1.db index 49690e53..86a9f90b 100644 --- a/bin/tests/system/notify/ns2/example1.db +++ b/bin/tests/system/notify/ns2/example1.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example1.db,v 1.7.12.4 2004/03/08 04:04:41 marka Exp $ +; $Id: example1.db,v 1.10 2004/03/05 05:01:47 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/notify/ns2/example2.db b/bin/tests/system/notify/ns2/example2.db index c34737ba..0f69b64d 100644 --- a/bin/tests/system/notify/ns2/example2.db +++ b/bin/tests/system/notify/ns2/example2.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example2.db,v 1.7.12.4 2004/03/08 04:04:41 marka Exp $ +; $Id: example2.db,v 1.10 2004/03/05 05:01:47 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/notify/ns2/example3.db b/bin/tests/system/notify/ns2/example3.db index 570e0a94..431ccca6 100644 --- a/bin/tests/system/notify/ns2/example3.db +++ b/bin/tests/system/notify/ns2/example3.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example3.db,v 1.7.12.4 2004/03/08 04:04:41 marka Exp $ +; $Id: example3.db,v 1.10 2004/03/05 05:01:47 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/notify/ns2/example4.db b/bin/tests/system/notify/ns2/example4.db index 132ee0ae..466859ec 100644 --- a/bin/tests/system/notify/ns2/example4.db +++ b/bin/tests/system/notify/ns2/example4.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example4.db,v 1.7.12.4 2004/03/08 04:04:42 marka Exp $ +; $Id: example4.db,v 1.10 2004/03/05 05:01:47 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/notify/ns2/named.conf b/bin/tests/system/notify/ns2/named.conf index 1efe9626..e1dad2b0 100644 --- a/bin/tests/system/notify/ns2/named.conf +++ b/bin/tests/system/notify/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.16.206.2 2004/03/06 10:22:17 marka Exp $ */ +/* $Id: named.conf,v 1.18 2004/03/05 05:01:47 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/notify/ns3/named.conf b/bin/tests/system/notify/ns3/named.conf index 7e94c631..63b51b71 100644 --- a/bin/tests/system/notify/ns3/named.conf +++ b/bin/tests/system/notify/ns3/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.19.206.2 2004/03/06 10:22:17 marka Exp $ */ +/* $Id: named.conf,v 1.21 2004/03/05 05:01:51 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh index 07614b75..b81d160f 100644 --- a/bin/tests/system/notify/setup.sh +++ b/bin/tests/system/notify/setup.sh @@ -15,6 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.6.206.2 2004/03/10 01:05:53 marka Exp $ +# $Id: setup.sh,v 1.8 2004/03/10 01:06:04 marka Exp $ cp -f ns2/example1.db ns2/example.db diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh index 932c3e36..324d01e8 100644 --- a/bin/tests/system/notify/tests.sh +++ b/bin/tests/system/notify/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.29.206.2 2004/03/10 01:05:53 marka Exp $ +# $Id: tests.sh,v 1.31 2004/03/10 01:06:04 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh index 57619b18..eecc625a 100644 --- a/bin/tests/system/nsupdate/clean.sh +++ b/bin/tests/system/nsupdate/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.7.206.2 2004/03/10 01:05:54 marka Exp $ +# $Id: clean.sh,v 1.9 2004/03/10 01:06:05 marka Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/nsupdate/knowngood.ns1.after b/bin/tests/system/nsupdate/knowngood.ns1.after index 0d815925..32e1c8d3 100644 --- a/bin/tests/system/nsupdate/knowngood.ns1.after +++ b/bin/tests/system/nsupdate/knowngood.ns1.after @@ -1,6 +1,6 @@ example.nil. 300 IN SOA ns1.example.nil. hostmaster.example.nil. 2 2000 2000 1814400 3600 +example.nil. 300 IN NS ns1.example.nil. example.nil. 300 IN NS ns2.example.nil. -example.nil. 300 IN NS ns3.example.nil. *.example.nil. 300 IN MX 10 mail.example.nil. a.example.nil. 300 IN TXT "foo foo foo" a.example.nil. 300 IN PTR foo.net. @@ -21,12 +21,12 @@ dname02.example.nil. 3600 IN DNAME dname-target.example.nil. dname03.example.nil. 3600 IN DNAME . e.example.nil. 300 IN MX 10 mail.example.nil. e.example.nil. 300 IN TXT "one" -e.example.nil. 300 IN TXT "three" e.example.nil. 300 IN TXT "two" +e.example.nil. 300 IN TXT "three" e.example.nil. 300 IN A 73.80.65.49 e.example.nil. 300 IN A 73.80.65.50 -e.example.nil. 300 IN A 73.80.65.52 e.example.nil. 300 IN A 73.80.65.51 +e.example.nil. 300 IN A 73.80.65.52 f.example.nil. 300 IN A 73.80.65.52 gpos01.example.nil. 3600 IN GPOS "-22.6882" "116.8652" "250.0" gpos02.example.nil. 3600 IN GPOS "" "" "" @@ -55,8 +55,8 @@ naptr01.example.nil. 3600 IN NAPTR 0 0 "" "" "" . naptr02.example.nil. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "blegh" foo. ns1.example.nil. 300 IN A 10.53.0.1 ns2.example.nil. 300 IN A 10.53.0.2 -nsap-ptr01.example.nil. 3600 IN NSAP-PTR foo. nsap-ptr01.example.nil. 3600 IN NSAP-PTR . +nsap-ptr01.example.nil. 3600 IN NSAP-PTR foo. nsap01.example.nil. 3600 IN NSAP 0x47000580005a0000000001e133ffffff00016100 nsap02.example.nil. 3600 IN NSAP 0x47000580005a0000000001e133ffffff00016100 nxt01.example.nil. 3600 IN NXT a.secure.example.nil. NS SOA MX SIG KEY LOC NXT @@ -97,4 +97,3 @@ wks02.example.nil. 3600 IN WKS 10.0.0.1 17 0 1 2 53 wks03.example.nil. 3600 IN WKS 10.0.0.2 6 65535 x2501.example.nil. 3600 IN X25 "123456789" example.nil. 300 IN SOA ns1.example.nil. hostmaster.example.nil. 2 2000 2000 1814400 3600 - diff --git a/bin/tests/system/nsupdate/knowngood.ns1.afterstop b/bin/tests/system/nsupdate/knowngood.ns1.afterstop index 5fbd1f6e..e871d4ce 100644 --- a/bin/tests/system/nsupdate/knowngood.ns1.afterstop +++ b/bin/tests/system/nsupdate/knowngood.ns1.afterstop @@ -1,3 +1,3 @@ updated4.example.nil. 600 IN A 10.10.10.3 +example.nil. 300 IN NS ns1.example.nil. example.nil. 300 IN NS ns2.example.nil. -example.nil. 300 IN NS ns3.example.nil. diff --git a/bin/tests/system/nsupdate/knowngood.ns1.before b/bin/tests/system/nsupdate/knowngood.ns1.before index 3b0e30c3..e108c2ac 100644 --- a/bin/tests/system/nsupdate/knowngood.ns1.before +++ b/bin/tests/system/nsupdate/knowngood.ns1.before @@ -1,6 +1,6 @@ example.nil. 300 IN SOA ns1.example.nil. hostmaster.example.nil. 1 2000 2000 1814400 3600 +example.nil. 300 IN NS ns1.example.nil. example.nil. 300 IN NS ns2.example.nil. -example.nil. 300 IN NS ns3.example.nil. *.example.nil. 300 IN MX 10 mail.example.nil. a.example.nil. 300 IN TXT "foo foo foo" a.example.nil. 300 IN PTR foo.net. @@ -21,12 +21,12 @@ dname02.example.nil. 3600 IN DNAME dname-target.example.nil. dname03.example.nil. 3600 IN DNAME . e.example.nil. 300 IN MX 10 mail.example.nil. e.example.nil. 300 IN TXT "one" -e.example.nil. 300 IN TXT "three" e.example.nil. 300 IN TXT "two" +e.example.nil. 300 IN TXT "three" e.example.nil. 300 IN A 73.80.65.49 e.example.nil. 300 IN A 73.80.65.50 -e.example.nil. 300 IN A 73.80.65.52 e.example.nil. 300 IN A 73.80.65.51 +e.example.nil. 300 IN A 73.80.65.52 f.example.nil. 300 IN A 73.80.65.52 gpos01.example.nil. 3600 IN GPOS "-22.6882" "116.8652" "250.0" gpos02.example.nil. 3600 IN GPOS "" "" "" @@ -55,8 +55,8 @@ naptr01.example.nil. 3600 IN NAPTR 0 0 "" "" "" . naptr02.example.nil. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "blegh" foo. ns1.example.nil. 300 IN A 10.53.0.1 ns2.example.nil. 300 IN A 10.53.0.2 -nsap-ptr01.example.nil. 3600 IN NSAP-PTR foo. nsap-ptr01.example.nil. 3600 IN NSAP-PTR . +nsap-ptr01.example.nil. 3600 IN NSAP-PTR foo. nsap01.example.nil. 3600 IN NSAP 0x47000580005a0000000001e133ffffff00016100 nsap02.example.nil. 3600 IN NSAP 0x47000580005a0000000001e133ffffff00016100 nxt01.example.nil. 3600 IN NXT a.secure.example.nil. NS SOA MX SIG KEY LOC NXT @@ -96,4 +96,3 @@ wks02.example.nil. 3600 IN WKS 10.0.0.1 17 0 1 2 53 wks03.example.nil. 3600 IN WKS 10.0.0.2 6 65535 x2501.example.nil. 3600 IN X25 "123456789" example.nil. 300 IN SOA ns1.example.nil. hostmaster.example.nil. 1 2000 2000 1814400 3600 - diff --git a/bin/tests/system/nsupdate/ns1/example1.db b/bin/tests/system/nsupdate/ns1/example1.db index f7b77a11..b060dd3f 100644 --- a/bin/tests/system/nsupdate/ns1/example1.db +++ b/bin/tests/system/nsupdate/ns1/example1.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example1.db,v 1.2.12.4 2004/03/08 04:04:42 marka Exp $ +; $Id: example1.db,v 1.5.18.1 2004/11/23 05:24:45 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes @@ -24,9 +24,9 @@ example.nil IN SOA ns1.example.nil. hostmaster.example.nil. ( 1814400 ; expire (3 weeks) 3600 ; minimum (1 hour) ) -example.nil. NS ns2.example.nil. +example.nil. NS ns1.example.nil. ns1.example.nil. A 10.53.0.1 -example.nil. NS ns3.example.nil. +example.nil. NS ns2.example.nil. ns2.example.nil. A 10.53.0.2 $ORIGIN example.nil. diff --git a/bin/tests/system/nsupdate/ns1/named.conf b/bin/tests/system/nsupdate/ns1/named.conf index 7873cfd5..41097a3e 100644 --- a/bin/tests/system/nsupdate/ns1/named.conf +++ b/bin/tests/system/nsupdate/ns1/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.10.206.2 2004/03/06 10:22:18 marka Exp $ */ +/* $Id: named.conf,v 1.12.18.3 2005/08/25 00:05:44 marka Exp $ */ controls { /* empty */ }; @@ -43,6 +43,7 @@ controls { zone "example.nil" { type master; file "example.db"; + check-integrity no; allow-update { any; }; allow-transfer { any; }; }; @@ -50,6 +51,7 @@ zone "example.nil" { zone "update.nil" { type master; file "update.db"; + check-integrity no; allow-update { any; }; allow-transfer { any; }; also-notify { 10.53.0.2; }; diff --git a/bin/tests/system/nsupdate/ns2/named.conf b/bin/tests/system/nsupdate/ns2/named.conf index cd1a330e..d48809ae 100644 --- a/bin/tests/system/nsupdate/ns2/named.conf +++ b/bin/tests/system/nsupdate/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.9.206.2 2004/03/06 10:22:18 marka Exp $ */ +/* $Id: named.conf,v 1.11 2004/03/05 05:02:05 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh index 7400a338..f545f200 100644 --- a/bin/tests/system/nsupdate/setup.sh +++ b/bin/tests/system/nsupdate/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.6.206.2 2004/03/10 01:05:54 marka Exp $ +# $Id: setup.sh,v 1.8 2004/03/10 01:06:05 marka Exp $ # # jnl and database files MUST be removed before we start diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh index 52871689..5ad42fbb 100644 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.22.206.1 2004/03/06 10:22:18 marka Exp $ +# $Id: tests.sh,v 1.23 2004/03/05 05:01:55 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/nsupdate/update_test.pl b/bin/tests/system/nsupdate/update_test.pl index 8ee30409..e3ed7d5e 100644 --- a/bin/tests/system/nsupdate/update_test.pl +++ b/bin/tests/system/nsupdate/update_test.pl @@ -37,7 +37,7 @@ # # perl -MCPAN -e "install Net::DNS" # -# $Id: update_test.pl,v 1.7.206.1 2004/03/06 10:22:18 marka Exp $ +# $Id: update_test.pl,v 1.8 2004/03/05 05:01:55 marka Exp $ # use Getopt::Std; diff --git a/bin/tests/system/resolver/ans2/ans.pl b/bin/tests/system/resolver/ans2/ans.pl index a5c5d452..7f5881a6 100644 --- a/bin/tests/system/resolver/ans2/ans.pl +++ b/bin/tests/system/resolver/ans2/ans.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: ans.pl,v 1.6.206.1 2004/03/06 10:22:22 marka Exp $ +# $Id: ans.pl,v 1.7 2004/03/05 05:02:29 marka Exp $ # # Ad hoc name server diff --git a/bin/tests/system/resolver/ans3/ans.pl b/bin/tests/system/resolver/ans3/ans.pl index dd069339..5821f002 100644 --- a/bin/tests/system/resolver/ans3/ans.pl +++ b/bin/tests/system/resolver/ans3/ans.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: ans.pl,v 1.5.206.1 2004/03/06 10:22:23 marka Exp $ +# $Id: ans.pl,v 1.6 2004/03/05 05:02:37 marka Exp $ # # Ad hoc name server diff --git a/bin/tests/system/resolver/ns1/named.conf b/bin/tests/system/resolver/ns1/named.conf index ffb113cd..c930fc38 100644 --- a/bin/tests/system/resolver/ns1/named.conf +++ b/bin/tests/system/resolver/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.8.206.2 2004/03/06 10:22:23 marka Exp $ */ +/* $Id: named.conf,v 1.10 2004/03/05 05:02:39 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/resolver/ns1/root.hint b/bin/tests/system/resolver/ns1/root.hint index 683d7e91..a1da93d0 100644 --- a/bin/tests/system/resolver/ns1/root.hint +++ b/bin/tests/system/resolver/ns1/root.hint @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.hint,v 1.4.206.1 2004/03/06 10:22:23 marka Exp $ +; $Id: root.hint,v 1.5 2004/03/05 05:02:39 marka Exp $ $TTL 999999 . IN NS a.root-servers.nil. diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh index 4494c1f5..7af482bb 100644 --- a/bin/tests/system/resolver/prereq.sh +++ b/bin/tests/system/resolver/prereq.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.4.206.1 2004/03/06 10:22:22 marka Exp $ +# $Id: prereq.sh,v 1.5 2004/03/05 05:02:27 marka Exp $ if $PERL -e 'use Net::DNS;' 2>/dev/null then diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index da11655f..87ca59c4 100644 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.6.206.1 2004/03/06 10:22:22 marka Exp $ +# $Id: tests.sh,v 1.7 2004/03/05 05:02:27 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/rrsetorder/clean.sh b/bin/tests/system/rrsetorder/clean.sh new file mode 100644 index 00000000..98c6b5cf --- /dev/null +++ b/bin/tests/system/rrsetorder/clean.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# +# Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: clean.sh,v 1.2.2.2 2006/03/05 23:58:51 marka Exp $ + +rm -f dig.out.cyclic dig.out.fixed dig.out.random +rm -f ns2/root.bk +rm -f ns?/named.run ns?/named.core + diff --git a/bin/tests/system/rrsetorder/dig.out.cyclic.good1 b/bin/tests/system/rrsetorder/dig.out.cyclic.good1 new file mode 100644 index 00000000..d2ca6fc3 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.cyclic.good1 @@ -0,0 +1,4 @@ +1.2.3.1 +1.2.3.4 +1.2.3.3 +1.2.3.2 diff --git a/bin/tests/system/rrsetorder/dig.out.cyclic.good2 b/bin/tests/system/rrsetorder/dig.out.cyclic.good2 new file mode 100644 index 00000000..c25c7560 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.cyclic.good2 @@ -0,0 +1,4 @@ +1.2.3.4 +1.2.3.3 +1.2.3.2 +1.2.3.1 diff --git a/bin/tests/system/rrsetorder/dig.out.cyclic.good3 b/bin/tests/system/rrsetorder/dig.out.cyclic.good3 new file mode 100644 index 00000000..e8deb671 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.cyclic.good3 @@ -0,0 +1,4 @@ +1.2.3.3 +1.2.3.2 +1.2.3.1 +1.2.3.4 diff --git a/bin/tests/system/rrsetorder/dig.out.cyclic.good4 b/bin/tests/system/rrsetorder/dig.out.cyclic.good4 new file mode 100644 index 00000000..3b276939 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.cyclic.good4 @@ -0,0 +1,4 @@ +1.2.3.2 +1.2.3.1 +1.2.3.4 +1.2.3.3 diff --git a/bin/tests/system/rrsetorder/dig.out.fixed.good b/bin/tests/system/rrsetorder/dig.out.fixed.good new file mode 100644 index 00000000..eaf9c631 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.fixed.good @@ -0,0 +1,4 @@ +1.2.3.4 +1.2.3.3 +1.2.3.1 +1.2.3.2 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good1 b/bin/tests/system/rrsetorder/dig.out.random.good1 new file mode 100644 index 00000000..c272c756 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good1 @@ -0,0 +1,4 @@ +1.2.3.1 +1.2.3.2 +1.2.3.3 +1.2.3.4 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good10 b/bin/tests/system/rrsetorder/dig.out.random.good10 new file mode 100644 index 00000000..6a39e3f3 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good10 @@ -0,0 +1,4 @@ +1.2.3.2 +1.2.3.3 +1.2.3.4 +1.2.3.1 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good11 b/bin/tests/system/rrsetorder/dig.out.random.good11 new file mode 100644 index 00000000..efbc7924 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good11 @@ -0,0 +1,4 @@ +1.2.3.2 +1.2.3.4 +1.2.3.1 +1.2.3.3 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good12 b/bin/tests/system/rrsetorder/dig.out.random.good12 new file mode 100644 index 00000000..c859a2e6 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good12 @@ -0,0 +1,4 @@ +1.2.3.2 +1.2.3.4 +1.2.3.3 +1.2.3.1 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good13 b/bin/tests/system/rrsetorder/dig.out.random.good13 new file mode 100644 index 00000000..49bf54b2 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good13 @@ -0,0 +1,4 @@ +1.2.3.3 +1.2.3.1 +1.2.3.2 +1.2.3.4 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good14 b/bin/tests/system/rrsetorder/dig.out.random.good14 new file mode 100644 index 00000000..974aa898 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good14 @@ -0,0 +1,4 @@ +1.2.3.3 +1.2.3.1 +1.2.3.4 +1.2.3.2 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good15 b/bin/tests/system/rrsetorder/dig.out.random.good15 new file mode 100644 index 00000000..e8deb671 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good15 @@ -0,0 +1,4 @@ +1.2.3.3 +1.2.3.2 +1.2.3.1 +1.2.3.4 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good16 b/bin/tests/system/rrsetorder/dig.out.random.good16 new file mode 100644 index 00000000..f4670876 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good16 @@ -0,0 +1,4 @@ +1.2.3.3 +1.2.3.2 +1.2.3.4 +1.2.3.1 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good17 b/bin/tests/system/rrsetorder/dig.out.random.good17 new file mode 100644 index 00000000..6082a255 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good17 @@ -0,0 +1,4 @@ +1.2.3.3 +1.2.3.4 +1.2.3.1 +1.2.3.2 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good18 b/bin/tests/system/rrsetorder/dig.out.random.good18 new file mode 100644 index 00000000..07eefa0e --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good18 @@ -0,0 +1,4 @@ +1.2.3.3 +1.2.3.4 +1.2.3.2 +1.2.3.1 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good19 b/bin/tests/system/rrsetorder/dig.out.random.good19 new file mode 100644 index 00000000..a5530c65 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good19 @@ -0,0 +1,4 @@ +1.2.3.4 +1.2.3.1 +1.2.3.2 +1.2.3.3 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good2 b/bin/tests/system/rrsetorder/dig.out.random.good2 new file mode 100644 index 00000000..00da93a4 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good2 @@ -0,0 +1,4 @@ +1.2.3.1 +1.2.3.2 +1.2.3.4 +1.2.3.3 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good20 b/bin/tests/system/rrsetorder/dig.out.random.good20 new file mode 100644 index 00000000..6dcf6daf --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good20 @@ -0,0 +1,4 @@ +1.2.3.4 +1.2.3.1 +1.2.3.3 +1.2.3.2 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good21 b/bin/tests/system/rrsetorder/dig.out.random.good21 new file mode 100644 index 00000000..9dcc63f2 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good21 @@ -0,0 +1,4 @@ +1.2.3.4 +1.2.3.2 +1.2.3.1 +1.2.3.3 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good22 b/bin/tests/system/rrsetorder/dig.out.random.good22 new file mode 100644 index 00000000..4c51aa60 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good22 @@ -0,0 +1,4 @@ +1.2.3.4 +1.2.3.2 +1.2.3.3 +1.2.3.1 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good23 b/bin/tests/system/rrsetorder/dig.out.random.good23 new file mode 100644 index 00000000..eaf9c631 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good23 @@ -0,0 +1,4 @@ +1.2.3.4 +1.2.3.3 +1.2.3.1 +1.2.3.2 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good24 b/bin/tests/system/rrsetorder/dig.out.random.good24 new file mode 100644 index 00000000..c25c7560 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good24 @@ -0,0 +1,4 @@ +1.2.3.4 +1.2.3.3 +1.2.3.2 +1.2.3.1 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good3 b/bin/tests/system/rrsetorder/dig.out.random.good3 new file mode 100644 index 00000000..4d50059a --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good3 @@ -0,0 +1,4 @@ +1.2.3.1 +1.2.3.3 +1.2.3.2 +1.2.3.4 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good4 b/bin/tests/system/rrsetorder/dig.out.random.good4 new file mode 100644 index 00000000..0b34afab --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good4 @@ -0,0 +1,4 @@ +1.2.3.1 +1.2.3.3 +1.2.3.4 +1.2.3.2 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good5 b/bin/tests/system/rrsetorder/dig.out.random.good5 new file mode 100644 index 00000000..efe0e253 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good5 @@ -0,0 +1,4 @@ +1.2.3.1 +1.2.3.4 +1.2.3.2 +1.2.3.3 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good6 b/bin/tests/system/rrsetorder/dig.out.random.good6 new file mode 100644 index 00000000..d2ca6fc3 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good6 @@ -0,0 +1,4 @@ +1.2.3.1 +1.2.3.4 +1.2.3.3 +1.2.3.2 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good7 b/bin/tests/system/rrsetorder/dig.out.random.good7 new file mode 100644 index 00000000..0d8312a2 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good7 @@ -0,0 +1,4 @@ +1.2.3.2 +1.2.3.1 +1.2.3.3 +1.2.3.4 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good8 b/bin/tests/system/rrsetorder/dig.out.random.good8 new file mode 100644 index 00000000..3b276939 --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good8 @@ -0,0 +1,4 @@ +1.2.3.2 +1.2.3.1 +1.2.3.4 +1.2.3.3 diff --git a/bin/tests/system/rrsetorder/dig.out.random.good9 b/bin/tests/system/rrsetorder/dig.out.random.good9 new file mode 100644 index 00000000..61192afb --- /dev/null +++ b/bin/tests/system/rrsetorder/dig.out.random.good9 @@ -0,0 +1,4 @@ +1.2.3.2 +1.2.3.3 +1.2.3.1 +1.2.3.4 diff --git a/bin/tests/system/rrsetorder/ns1/named.conf b/bin/tests/system/rrsetorder/ns1/named.conf new file mode 100644 index 00000000..a2a17051 --- /dev/null +++ b/bin/tests/system/rrsetorder/ns1/named.conf @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: named.conf,v 1.2.2.1 2006/03/03 00:56:53 marka Exp $ */ + +controls { /* empty */ }; + +options { + query-source address 10.53.0.1; + notify-source 10.53.0.1; + transfer-source 10.53.0.1; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.1; }; + listen-on-v6 { none; }; + recursion no; + notify yes; + rrset-order { + name "fixed.example" order fixed; + name "random.example" order random; + name "cyclic.example" order cyclic; + type NS order random; + order cyclic; + }; +}; + +zone "." { + type master; + file "root.db"; +}; diff --git a/bin/tests/system/rrsetorder/ns1/root.db b/bin/tests/system/rrsetorder/ns1/root.db new file mode 100644 index 00000000..1952bf78 --- /dev/null +++ b/bin/tests/system/rrsetorder/ns1/root.db @@ -0,0 +1,40 @@ +; Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: root.db,v 1.2.2.1 2006/03/03 00:56:53 marka Exp $ + +$TTL 3600 +. SOA hostmaster.isc.org. a.root-servers.nil. ( + 2000042100 + 600 + 600 + 1200 + 600 ) +. NS a.root-servers.nil. +a.root-servers.nil A 10.53.0.1 +; +fixed.example. A 1.2.3.4 +fixed.example. A 1.2.3.3 +fixed.example. A 1.2.3.1 +fixed.example. A 1.2.3.2 +; +random.example. A 1.2.3.1 +random.example. A 1.2.3.2 +random.example. A 1.2.3.3 +random.example. A 1.2.3.4 +; +cyclic.example. A 1.2.3.4 +cyclic.example. A 1.2.3.3 +cyclic.example. A 1.2.3.2 +cyclic.example. A 1.2.3.1 diff --git a/bin/tests/system/rrsetorder/ns2/named.conf b/bin/tests/system/rrsetorder/ns2/named.conf new file mode 100644 index 00000000..23690fa8 --- /dev/null +++ b/bin/tests/system/rrsetorder/ns2/named.conf @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: named.conf,v 1.2.2.1 2006/03/03 00:56:53 marka Exp $ */ + +controls { /* empty */ }; + +options { + query-source address 10.53.0.2; + notify-source 10.53.0.2; + transfer-source 10.53.0.2; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.2; }; + listen-on-v6 { none; }; + recursion no; + notify yes; + // flush-zones-on-shutdown yes; + rrset-order { + name "fixed.example" order fixed; + name "random.example" order random; + name "cyclic.example" order cyclic; + type NS order random; + order cyclic; + }; +}; + +zone "." { + type slave; + masters { 10.53.0.1; }; + file "root.bk"; +}; diff --git a/bin/tests/system/rrsetorder/ns3/named.conf b/bin/tests/system/rrsetorder/ns3/named.conf new file mode 100644 index 00000000..5df9a86b --- /dev/null +++ b/bin/tests/system/rrsetorder/ns3/named.conf @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: named.conf,v 1.2.2.1 2006/03/03 00:56:53 marka Exp $ */ + +controls { /* empty */ }; + +options { + query-source address 10.53.0.3; + notify-source 10.53.0.3; + transfer-source 10.53.0.3; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.3; }; + listen-on-v6 { none; }; + recursion yes; + notify yes; + rrset-order { + name "fixed.example" order fixed; + name "random.example" order random; + name "cyclic.example" order cyclic; + type NS order random; + order cyclic; + }; +}; + +zone "." { + type hint; + file "../../common/root.hint"; +}; + diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh new file mode 100644 index 00000000..837d0a74 --- /dev/null +++ b/bin/tests/system/rrsetorder/tests.sh @@ -0,0 +1,329 @@ +#!/bin/sh +# +# Copyright (C) 2006 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: tests.sh,v 1.2.2.2 2006/03/05 23:58:51 marka Exp $ + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +status=0 + +# +# +# +echo "I: Checking order fixed (master)" +ret=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.1 fixed.example > dig.out.fixed || ret=1 +cmp -s dig.out.fixed dig.out.fixed.good || ret=1 +done +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +# +# +# +echo "I: Checking order cyclic (master)" +ret=0 +match1=0 +match2=0 +match3=0 +match4=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.1 cyclic.example > dig.out.cyclic || ret=1 +cmp -s dig.out.cyclic dig.out.cyclic.good1 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good2 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good3 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good4 || \ +ret=1 + +cmp -s dig.out.cyclic dig.out.cyclic.good1 && match1=1 +cmp -s dig.out.cyclic dig.out.cyclic.good2 && match2=1 +cmp -s dig.out.cyclic dig.out.cyclic.good3 && match3=1 +cmp -s dig.out.cyclic dig.out.cyclic.good4 && match4=1 + +done +match=`expr $match1 + $match2 + $match3 + $match4` +if [ $match != 4 ]; then ret=1; fi +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +echo "I: Checking order random (master)" +ret=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +do + eval match$i=0 +done +for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.1 random.example > dig.out.random || ret=1 + match=0 + for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 + do + eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1" + if [ $match -eq 1 ]; then break; fi + done + if [ $match -eq 0 ]; then ret=1; fi +done +match=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +do + eval "match=\`expr \$match + \$match$i\`" +done +echo "I: Random selection return $match of 24 possible orders in 36 samples" +if [ $match -lt 8 ]; then echo ret=1; fi +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +# +# +# +echo "I: Checking order fixed (slave)" +ret=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.2 fixed.example > dig.out.fixed || ret=1 +cmp -s dig.out.fixed dig.out.fixed.good || ret=1 +done +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +# +# +# +echo "I: Checking order cyclic (slave)" +ret=0 +match1=0 +match2=0 +match3=0 +match4=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1 +cmp -s dig.out.cyclic dig.out.cyclic.good1 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good2 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good3 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good4 || \ +ret=1 + +cmp -s dig.out.cyclic dig.out.cyclic.good1 && match1=1 +cmp -s dig.out.cyclic dig.out.cyclic.good2 && match2=1 +cmp -s dig.out.cyclic dig.out.cyclic.good3 && match3=1 +cmp -s dig.out.cyclic dig.out.cyclic.good4 && match4=1 + +done +match=`expr $match1 + $match2 + $match3 + $match4` +if [ $match != 4 ]; then ret=1; fi +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +echo "I: Checking order random (slave)" +ret=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +do + eval match$i=0 +done +for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.2 random.example > dig.out.random || ret=1 + match=0 + for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 + do + eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1" + if [ $match -eq 1 ]; then break; fi + done + if [ $match -eq 0 ]; then ret=1; fi +done +match=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +do +eval "match=\`expr \$match + \$match$i\`" +done +echo "I: Random selection return $match of 24 possible orders in 36 samples" +if [ $match -lt 8 ]; then echo ret=1; fi +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +echo "I: Shutting down slave" + +(cd ..; sh stop.sh rrsetorder ns2 ) + +echo "I: Checking for slave's on disk copy of zone" + +if [ ! -f ns2/root.bk ] +then + echo "I:failed"; + status=`expr $status + 1` +fi + +echo "I: Re-starting slave" + +(cd ..; sh start.sh --noclean rrsetorder ns2 ) + +# +# +# +echo "I: Checking order fixed (slave loaded from disk)" +ret=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.2 fixed.example > dig.out.fixed || ret=1 +cmp -s dig.out.fixed dig.out.fixed.good || ret=1 +done +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +# +# +# +echo "I: Checking order cyclic (slave loaded from disk)" +ret=0 +match1=0 +match2=0 +match3=0 +match4=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.2 cyclic.example > dig.out.cyclic || ret=1 +cmp -s dig.out.cyclic dig.out.cyclic.good1 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good2 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good3 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good4 || \ +ret=1 + +cmp -s dig.out.cyclic dig.out.cyclic.good1 && match1=1 +cmp -s dig.out.cyclic dig.out.cyclic.good2 && match2=1 +cmp -s dig.out.cyclic dig.out.cyclic.good3 && match3=1 +cmp -s dig.out.cyclic dig.out.cyclic.good4 && match4=1 + +done +match=`expr $match1 + $match2 + $match3 + $match4` +if [ $match != 4 ]; then ret=1; fi +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +echo "I: Checking order random (slave loaded from disk)" +ret=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +do + eval match$i=0 +done +for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.2 random.example > dig.out.random || ret=1 + match=0 + for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 + do + eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1" + if [ $match -eq 1 ]; then break; fi + done + if [ $match -eq 0 ]; then ret=1; fi +done +match=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +do +eval "match=\`expr \$match + \$match$i\`" +done +echo "I: Random selection return $match of 24 possible orders in 36 samples" +if [ $match -lt 8 ]; then echo ret=1; fi +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +# +# +# +echo "I: Checking order fixed (cache)" +ret=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.3 fixed.example > dig.out.fixed || ret=1 +cmp -s dig.out.fixed dig.out.fixed.good || ret=1 +done +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +# +# +# +echo "I: Checking order cyclic (cache)" +ret=0 +match1=0 +match2=0 +match3=0 +match4=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.3 cyclic.example > dig.out.cyclic || ret=1 +cmp -s dig.out.cyclic dig.out.cyclic.good1 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good2 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good3 || \ +cmp -s dig.out.cyclic dig.out.cyclic.good4 || \ +ret=1 + +cmp -s dig.out.cyclic dig.out.cyclic.good1 && match1=1 +cmp -s dig.out.cyclic dig.out.cyclic.good2 && match2=1 +cmp -s dig.out.cyclic dig.out.cyclic.good3 && match3=1 +cmp -s dig.out.cyclic dig.out.cyclic.good4 && match4=1 + +done +match=`expr $match1 + $match2 + $match3 + $match4` +if [ $match != 4 ]; then ret=1; fi +if [ $ret != 0 ]; then echo "I:failed"; fi +status=`expr $status + $ret` + +echo "I: Checking order random (cache)" +ret=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +do + eval match$i=0 +done +for i in a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 9 +do +$DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \ + -p 5300 @10.53.0.3 random.example > dig.out.random || ret=1 + match=0 + for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 + do + eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1" + if [ $match -eq 1 ]; then break; fi + done + if [ $match -eq 0 ]; then ret=1; fi +done +match=0 +for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 +do +eval "match=\`expr \$match + \$match$i\`" +done +echo "I: Random selection return $match of 24 possible orders in 36 samples" +if [ $match -lt 8 ]; then echo ret=1; fi +if [ $ret != 0 ]; then echo "I:failed"; fi + +status=`expr $status + $ret` +echo "I:exit status: $status" +exit $status diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh index 1edfeac8..dd497edd 100644 --- a/bin/tests/system/run.sh +++ b/bin/tests/system/run.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: run.sh,v 1.38.12.3 2004/03/08 04:04:33 marka Exp $ +# $Id: run.sh,v 1.40 2004/03/05 04:59:12 marka Exp $ # # Run a system test. diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh index ed613bb2..ac23ce0c 100644 --- a/bin/tests/system/runall.sh +++ b/bin/tests/system/runall.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: runall.sh,v 1.4.12.3 2004/03/08 04:04:33 marka Exp $ +# $Id: runall.sh,v 1.6 2004/03/05 04:59:12 marka Exp $ # # Run all the system tests. diff --git a/bin/tests/system/send.pl b/bin/tests/system/send.pl index 89d3f658..5e17ab3d 100644 --- a/bin/tests/system/send.pl +++ b/bin/tests/system/send.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: send.pl,v 1.2.206.1 2004/03/06 10:21:48 marka Exp $ +# $Id: send.pl,v 1.3 2004/03/05 04:59:12 marka Exp $ # # Send a file to a given address and port using TCP. Used for diff --git a/bin/tests/system/setup.sh b/bin/tests/system/setup.sh index 38aabb56..5223e314 100644 --- a/bin/tests/system/setup.sh +++ b/bin/tests/system/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.8.206.1 2004/03/06 10:21:48 marka Exp $ +# $Id: setup.sh,v 1.9 2004/03/05 04:59:13 marka Exp $ # # Run a system test. diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh index 782c6ef9..5bde7d0e 100644 --- a/bin/tests/system/sortlist/clean.sh +++ b/bin/tests/system/sortlist/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.3.206.1 2004/03/06 10:22:24 marka Exp $ +# $Id: clean.sh,v 1.4 2004/03/05 05:02:41 marka Exp $ rm -f *.dig *.good diff --git a/bin/tests/system/sortlist/ns1/example.db b/bin/tests/system/sortlist/ns1/example.db index 40a8fd65..e2db2774 100644 --- a/bin/tests/system/sortlist/ns1/example.db +++ b/bin/tests/system/sortlist/ns1/example.db @@ -13,10 +13,10 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.3.206.1 2004/03/06 10:22:24 marka Exp $ +; $Id: example.db,v 1.4.18.1 2004/11/23 05:24:45 marka Exp $ $TTL 300 ; 5 minutes -@ IN SOA ns2.example. hostmaster.example. ( +@ IN SOA ns1.example. hostmaster.example. ( 2000042795 ; serial 20 ; refresh (20 seconds) 20 ; retry (20 seconds) @@ -24,7 +24,7 @@ $TTL 300 ; 5 minutes 3600 ; minimum (1 hour) ) example. NS ns1.example. -ns2.example. A 10.53.0.1 +ns1.example. A 10.53.0.1 ; Let's see what the sortlist picks out of this... a A 1.1.1.1 diff --git a/bin/tests/system/sortlist/ns1/named.conf b/bin/tests/system/sortlist/ns1/named.conf index 57f1402a..6c03b1da 100644 --- a/bin/tests/system/sortlist/ns1/named.conf +++ b/bin/tests/system/sortlist/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.5.12.4 2004/03/08 09:04:17 marka Exp $ */ +/* $Id: named.conf,v 1.8 2004/03/05 05:02:44 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/sortlist/ns1/root.db b/bin/tests/system/sortlist/ns1/root.db index f1562f27..608ffd98 100644 --- a/bin/tests/system/sortlist/ns1/root.db +++ b/bin/tests/system/sortlist/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.2.206.1 2004/03/06 10:22:25 marka Exp $ +; $Id: root.db,v 1.3 2004/03/05 05:02:44 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh index c711fa75..3c95496d 100644 --- a/bin/tests/system/sortlist/tests.sh +++ b/bin/tests/system/sortlist/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.4.12.3 2004/03/08 04:04:44 marka Exp $ +# $Id: tests.sh,v 1.6 2004/03/05 05:02:42 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl index cf6bec05..0cd7531a 100644 --- a/bin/tests/system/start.pl +++ b/bin/tests/system/start.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: start.pl,v 1.3.206.2 2004/03/10 02:55:53 marka Exp $ +# $Id: start.pl,v 1.5.18.4 2006/03/05 23:58:51 marka Exp $ # Framework for starting test servers. # Based on the type of server specified, check for port availability, remove @@ -47,8 +47,8 @@ if (!$test) { if (!-d $test) { print "No test directory: \"$test\"\n"; } -if ($server && !-d $server) { - print "No server directory: \"$test\"\n"; +if ($server && !-d "$test/$server") { + print "No server directory: \"$test/$server\"\n"; } # Global variables @@ -129,7 +129,7 @@ sub start_server { if ($options) { $command .= "$options"; } else { - $command .= "-m record -c named.conf -d 99 -g"; + $command .= "-m record,size,mctx -c named.conf -d 99 -g"; } $command .= " >named.run 2>&1 &"; $pid_file = "named.pid"; @@ -139,7 +139,7 @@ sub start_server { if ($options) { $command .= "$options"; } else { - $command .= "-m record -C resolv.conf -d 99 -g -i lwresd.pid -P 9210 -p 5300"; + $command .= "-m record,size,mctx -C resolv.conf -d 99 -g -i lwresd.pid -P 9210 -p 5300"; } $command .= " >lwresd.run 2>&1 &"; $pid_file = "lwresd.pid"; diff --git a/bin/tests/system/start.sh b/bin/tests/system/start.sh index 49629cde..928aa8fa 100644 --- a/bin/tests/system/start.sh +++ b/bin/tests/system/start.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: start.sh,v 1.38.206.1 2004/03/06 10:21:48 marka Exp $ +# $Id: start.sh,v 1.39 2004/03/05 04:59:13 marka Exp $ . ./conf.sh $PERL start.pl "$@" diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl index 853a50cc..29476d11 100644 --- a/bin/tests/system/stop.pl +++ b/bin/tests/system/stop.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: stop.pl,v 1.4.12.3 2004/03/08 04:04:33 marka Exp $ +# $Id: stop.pl,v 1.6.18.4 2006/03/05 23:58:51 marka Exp $ # Framework for stopping test servers # Based on the type of server specified, signal the server to stop, wait @@ -50,7 +50,7 @@ my $errors = 0; die "$usage\n" unless defined($test); die "No test directory: \"$test\"\n" unless (-d $test); -die "No server directory: \"$server\"\n" if (defined($server) && !-d $server); +die "No server directory: \"$server\"\n" if (defined($server) && !-d "$test/$server"); # Global variables my $testdir = abs_path($test); @@ -80,7 +80,7 @@ if ($use_rndc) { stop_rndc($server); } - wait_for_servers(5, grep /^ns/, @servers); + wait_for_servers(30, grep /^ns/, @servers); } @@ -88,8 +88,8 @@ if ($use_rndc) { foreach my $server (@servers) { stop_signal($server, "TERM"); } -wait_for_servers(5, @servers); +wait_for_servers(60, @servers); # Pass 3: SIGABRT foreach my $server (@servers) { diff --git a/bin/tests/system/stop.sh b/bin/tests/system/stop.sh index d7ba07b3..47394534 100644 --- a/bin/tests/system/stop.sh +++ b/bin/tests/system/stop.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: stop.sh,v 1.21.206.1 2004/03/06 10:21:48 marka Exp $ +# $Id: stop.sh,v 1.22 2004/03/05 04:59:13 marka Exp $ . ./conf.sh $PERL ./stop.pl "$@" diff --git a/bin/tests/system/stress/clean.sh b/bin/tests/system/stress/clean.sh index 4ba31cd2..1e423ac7 100644 --- a/bin/tests/system/stress/clean.sh +++ b/bin/tests/system/stress/clean.sh @@ -15,7 +15,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.206.1 2004/03/06 10:22:25 marka Exp $ +# $Id: clean.sh,v 1.3 2004/03/05 05:02:47 marka Exp $ rm -f reload.pid diff --git a/bin/tests/system/stress/ns1/named.conf b/bin/tests/system/stress/ns1/named.conf index e6d8aedb..77f7392a 100644 --- a/bin/tests/system/stress/ns1/named.conf +++ b/bin/tests/system/stress/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.2.206.2 2004/03/06 10:22:26 marka Exp $ */ +/* $Id: named.conf,v 1.4 2004/03/05 05:02:50 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/stress/ns2/named.conf b/bin/tests/system/stress/ns2/named.conf index 0cc8b6f6..faccd201 100644 --- a/bin/tests/system/stress/ns2/named.conf +++ b/bin/tests/system/stress/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.3.206.2 2004/03/06 10:22:26 marka Exp $ */ +/* $Id: named.conf,v 1.5 2004/03/05 05:02:52 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/stress/ns3/named.conf b/bin/tests/system/stress/ns3/named.conf index 29246122..ceaa839b 100644 --- a/bin/tests/system/stress/ns3/named.conf +++ b/bin/tests/system/stress/ns3/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.3.206.2 2004/03/06 10:22:27 marka Exp $ */ +/* $Id: named.conf,v 1.5 2004/03/05 05:02:55 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/stress/ns4/named.conf b/bin/tests/system/stress/ns4/named.conf index b3cfeccb..c805a449 100644 --- a/bin/tests/system/stress/ns4/named.conf +++ b/bin/tests/system/stress/ns4/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.3.206.2 2004/03/06 10:22:27 marka Exp $ */ +/* $Id: named.conf,v 1.5 2004/03/05 05:02:57 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/stress/setup.pl b/bin/tests/system/stress/setup.pl index 6c16c06a..156f6141 100644 --- a/bin/tests/system/stress/setup.pl +++ b/bin/tests/system/stress/setup.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.pl,v 1.2.12.3 2004/03/08 09:04:17 marka Exp $ +# $Id: setup.pl,v 1.4 2004/03/05 05:02:48 marka Exp $ # # Set up test data for zone transfer quota tests. diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh index 1867477a..85d81d52 100644 --- a/bin/tests/system/stress/setup.sh +++ b/bin/tests/system/stress/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2.206.1 2004/03/06 10:22:25 marka Exp $ +# $Id: setup.sh,v 1.3 2004/03/05 05:02:48 marka Exp $ # # Set up test data for zone transfer quota tests. diff --git a/bin/tests/system/stress/tests.sh b/bin/tests/system/stress/tests.sh index 494dbd9d..63b9647d 100644 --- a/bin/tests/system/stress/tests.sh +++ b/bin/tests/system/stress/tests.sh @@ -15,7 +15,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.206.1 2004/03/06 10:22:25 marka Exp $ +# $Id: tests.sh,v 1.3 2004/03/05 05:02:48 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/stress/update.pl b/bin/tests/system/stress/update.pl index e0507f96..b96bcddc 100644 --- a/bin/tests/system/stress/update.pl +++ b/bin/tests/system/stress/update.pl @@ -37,7 +37,7 @@ # # perl -MCPAN -e "install Net::DNS" # -# $Id: update.pl,v 1.2.206.1 2004/03/06 10:22:26 marka Exp $ +# $Id: update.pl,v 1.3 2004/03/05 05:02:48 marka Exp $ # use Getopt::Std; diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh index 299c871f..bbbe7428 100644 --- a/bin/tests/system/stub/clean.sh +++ b/bin/tests/system/stub/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.6.206.1 2004/03/06 10:22:28 marka Exp $ +# $Id: clean.sh,v 1.7 2004/03/05 05:02:59 marka Exp $ # # Clean up after stub tests. diff --git a/bin/tests/system/stub/ns1/named.conf b/bin/tests/system/stub/ns1/named.conf index 04609dda..ee0689d6 100644 --- a/bin/tests/system/stub/ns1/named.conf +++ b/bin/tests/system/stub/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.10.206.2 2004/03/06 10:22:30 marka Exp $ */ +/* $Id: named.conf,v 1.12 2004/03/05 05:03:01 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/stub/ns1/root.db b/bin/tests/system/stub/ns1/root.db index 96104962..3b91a34a 100644 --- a/bin/tests/system/stub/ns1/root.db +++ b/bin/tests/system/stub/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.6.206.1 2004/03/06 10:22:30 marka Exp $ +; $Id: root.db,v 1.7 2004/03/05 05:03:01 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/stub/ns2/child.example.db b/bin/tests/system/stub/ns2/child.example.db index 0c98d8bd..a6730a07 100644 --- a/bin/tests/system/stub/ns2/child.example.db +++ b/bin/tests/system/stub/ns2/child.example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: child.example.db,v 1.6.206.1 2004/03/06 10:22:31 marka Exp $ +; $Id: child.example.db,v 1.7 2004/03/05 05:03:03 marka Exp $ $TTL 300 ; 5 minutes child.example. IN SOA ns2.child.example. hostmaster.child.example. ( diff --git a/bin/tests/system/stub/ns2/named.conf b/bin/tests/system/stub/ns2/named.conf index 10c459e9..ccaaa65d 100644 --- a/bin/tests/system/stub/ns2/named.conf +++ b/bin/tests/system/stub/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.10.206.2 2004/03/06 10:22:31 marka Exp $ */ +/* $Id: named.conf,v 1.12 2004/03/05 05:03:04 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/stub/ns3/example.db b/bin/tests/system/stub/ns3/example.db index 0a7f7707..63560109 100644 --- a/bin/tests/system/stub/ns3/example.db +++ b/bin/tests/system/stub/ns3/example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.6.206.1 2004/03/06 10:22:32 marka Exp $ +; $Id: example.db,v 1.7 2004/03/05 05:03:08 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/stub/ns3/named.conf b/bin/tests/system/stub/ns3/named.conf index 3a9cfa49..f272780d 100644 --- a/bin/tests/system/stub/ns3/named.conf +++ b/bin/tests/system/stub/ns3/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.11.206.2 2004/03/06 10:22:32 marka Exp $ */ +/* $Id: named.conf,v 1.13 2004/03/05 05:03:08 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh index 722aba25..91c5db5e 100644 --- a/bin/tests/system/stub/tests.sh +++ b/bin/tests/system/stub/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.11.206.1 2004/03/06 10:22:30 marka Exp $ +# $Id: tests.sh,v 1.12 2004/03/05 05:02:59 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/testsock.pl b/bin/tests/system/testsock.pl index dc579e48..07e87ae0 100644 --- a/bin/tests/system/testsock.pl +++ b/bin/tests/system/testsock.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: testsock.pl,v 1.13.206.1 2004/03/06 10:21:48 marka Exp $ +# $Id: testsock.pl,v 1.14 2004/03/05 04:59:13 marka Exp $ # Test whether the interfaces on 10.53.0.* are up. diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in index 19a526fe..ccdc3b8d 100644 --- a/bin/tests/system/tkey/Makefile.in +++ b/bin/tests/system/tkey/Makefile.in @@ -13,7 +13,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.3.12.7 2004/07/20 07:01:54 marka Exp $ +# $Id: Makefile.in,v 1.8.18.1 2004/07/20 07:03:24 marka Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh index c93bb10e..b97da604 100644 --- a/bin/tests/system/tkey/clean.sh +++ b/bin/tests/system/tkey/clean.sh @@ -15,7 +15,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.206.1 2004/03/06 10:22:33 marka Exp $ +# $Id: clean.sh,v 1.3 2004/03/05 05:03:12 marka Exp $ rm -f dig.out.* random.data ns1/named.conf rm -f K* ns1/K* diff --git a/bin/tests/system/tkey/keycreate.c b/bin/tests/system/tkey/keycreate.c index c9a5ef01..5831e4c1 100644 --- a/bin/tests/system/tkey/keycreate.c +++ b/bin/tests/system/tkey/keycreate.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keycreate.c,v 1.7.12.7 2006/01/04 23:50:20 marka Exp $ */ +/* $Id: keycreate.c,v 1.10.18.3 2005/11/30 23:52:53 marka Exp $ */ #include <config.h> diff --git a/bin/tests/system/tkey/keydelete.c b/bin/tests/system/tkey/keydelete.c index dcdac375..5b3330e5 100644 --- a/bin/tests/system/tkey/keydelete.c +++ b/bin/tests/system/tkey/keydelete.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: keydelete.c,v 1.4.206.5 2006/01/04 23:50:20 marka Exp $ */ +/* $Id: keydelete.c,v 1.6.18.3 2005/11/30 23:52:53 marka Exp $ */ #include <config.h> diff --git a/bin/tests/system/tkey/ns1/named.conf.in b/bin/tests/system/tkey/ns1/named.conf.in index ce555d03..863b4658 100644 --- a/bin/tests/system/tkey/ns1/named.conf.in +++ b/bin/tests/system/tkey/ns1/named.conf.in @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf.in,v 1.2.206.2 2004/03/06 10:22:35 marka Exp $ */ +/* $Id: named.conf.in,v 1.4 2004/03/05 05:03:16 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh index b411055d..7e8748d0 100644 --- a/bin/tests/system/tkey/ns1/setup.sh +++ b/bin/tests/system/tkey/ns1/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2.2.2.10.2 2004/06/11 00:30:54 marka Exp $ +# $Id: setup.sh,v 1.5.18.1 2004/06/11 00:30:13 marka Exp $ RANDFILE=../random.data diff --git a/bin/tests/system/tkey/prereq.sh b/bin/tests/system/tkey/prereq.sh index 4bf62dd9..5eea1187 100644 --- a/bin/tests/system/tkey/prereq.sh +++ b/bin/tests/system/tkey/prereq.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 2001 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -15,11 +15,11 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: prereq.sh,v 1.4.206.2 2004/12/08 06:13:02 marka Exp $ +# $Id: prereq.sh,v 1.5.18.3 2006/01/04 00:37:23 marka Exp $ ../../genrandom 400 random.data -if $KEYGEN -a RSA -b 512 -n zone -r random.data foo > /dev/null 2>&1 +if $KEYGEN -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1 then rm -f foo* else diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh index 59ed5885..4c6a4dcd 100644 --- a/bin/tests/system/tkey/setup.sh +++ b/bin/tests/system/tkey/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2.206.1 2004/03/06 10:22:34 marka Exp $ +# $Id: setup.sh,v 1.3 2004/03/05 05:03:13 marka Exp $ RANDFILE=random.data diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh index caf16621..9af60b36 100644 --- a/bin/tests/system/tkey/tests.sh +++ b/bin/tests/system/tkey/tests.sh @@ -15,7 +15,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.12.4 2004/06/11 00:30:53 marka Exp $ +# $Id: tests.sh,v 1.4.18.1 2004/06/11 00:30:13 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/tsig/clean.sh b/bin/tests/system/tsig/clean.sh new file mode 100644 index 00000000..f97c273b --- /dev/null +++ b/bin/tests/system/tsig/clean.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# +# Copyright (C) 2005, 2006 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: clean.sh,v 1.2.2.2 2006/01/27 23:57:44 marka Exp $ + +# +# Clean up after tsig tests. +# + +rm -f dig.out.* diff --git a/bin/tests/system/tsig/ns1/example.db b/bin/tests/system/tsig/ns1/example.db new file mode 100644 index 00000000..6c16be89 --- /dev/null +++ b/bin/tests/system/tsig/ns1/example.db @@ -0,0 +1,151 @@ +; Copyright (C) 2005, 2006 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: example.db,v 1.2.2.2 2006/01/27 23:57:44 marka Exp $ + +$ORIGIN . +$TTL 300 ; 5 minutes +example.nil IN SOA ns1.example.nil. hostmaster.example.nil. ( + 1 ; serial + 2000 ; refresh (2000 seconds) + 2000 ; retry (2000 seconds) + 1814400 ; expire (3 weeks) + 3600 ; minimum (1 hour) + ) +example.nil. NS ns1.example.nil. +ns1.example.nil. A 10.53.0.1 +example.nil. NS ns2.example.nil. +ns2.example.nil. A 10.53.0.2 + +$ORIGIN example.nil. +* MX 10 mail +a TXT "foo foo foo" + PTR foo.net. +$TTL 3600 ; 1 hour +a01 A 0.0.0.0 +a02 A 255.255.255.255 +a601 AAAA ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff +afsdb01 AFSDB 0 hostname +afsdb02 AFSDB 65535 . +$TTL 300 ; 5 minutes +b CNAME foo.net. +c A 73.80.65.49 +$TTL 3600 ; 1 hour +cert01 CERT 65534 65535 PRIVATEOID ( + MxFcby9k/yvedMfQgKzhH5er0Mu/vILz45IkskceFGgi + WCn/GxHhai6VAuHAoNUz4YoU1tVfSCSqQYn6//11U6Nl + d80jEeC8aTrO+KKmCaY= ) +cname01 CNAME cname-target. +cname02 CNAME cname-target +cname03 CNAME . +$TTL 300 ; 5 minutes +d A 73.80.65.49 +$TTL 3600 ; 1 hour +dname01 DNAME dname-target. +dname02 DNAME dname-target +dname03 DNAME . +$TTL 300 ; 5 minutes +e MX 10 mail + TXT "one" + TXT "three" + TXT "two" + A 73.80.65.49 + A 73.80.65.50 + A 73.80.65.52 + A 73.80.65.51 +f A 73.80.65.52 +$TTL 3600 ; 1 hour +gpos01 GPOS "-22.6882" "116.8652" "250.0" +gpos02 GPOS "" "" "" +hinfo01 HINFO "Generic PC clone" "NetBSD-1.4" +hinfo02 HINFO "PC" "NetBSD" +isdn01 ISDN "isdn-address" +isdn02 ISDN "isdn-address" "subaddress" +isdn03 ISDN "isdn-address" +isdn04 ISDN "isdn-address" "subaddress" +key01 KEY 512 255 1 ( + AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aR + yzWZriO6i2odGWWQVucZqKVsENW91IOW4vqudngPZsY3 + GvQ/xVA8/7pyFj6b7Esga60zyGW6LFe9r8n6paHrlG5o + jqf0BaqHT+8= ) +kx01 KX 10 kdc +kx02 KX 10 . +loc01 LOC 60 9 0.000 N 24 39 0.000 E 10.00m 20m 2000m 20m +loc02 LOC 60 9 0.000 N 24 39 0.000 E 10.00m 20m 2000m 20m +mb01 MG madname +mb02 MG . +mg01 MG mgmname +mg02 MG . +minfo01 MINFO rmailbx emailbx +minfo02 MINFO . . +mr01 MR mrname +mr02 MR . +mx01 MX 10 mail +mx02 MX 10 . +naptr01 NAPTR 0 0 "" "" "" . +naptr02 NAPTR 65535 65535 "blurgh" "blorf" "blegh" foo. +nsap-ptr01 NSAP-PTR foo. + NSAP-PTR . +nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100 +nsap02 NSAP 0x47000580005a0000000001e133ffffff00016100 +nxt01 NXT a.secure ( NS SOA MX SIG KEY LOC NXT ) +nxt02 NXT . ( NSAP-PTR NXT ) +nxt03 NXT . ( A ) +nxt04 NXT . ( 127 ) +ptr01 PTR example.nil. +px01 PX 65535 foo. bar. +px02 PX 65535 . . +rp01 RP mbox-dname txt-dname +rp02 RP . . +rt01 RT 0 intermediate-host +rt02 RT 65535 . +$TTL 300 ; 5 minutes +s NS ns.s +$ORIGIN s.example.nil. +ns A 73.80.65.49 +$ORIGIN example.nil. +$TTL 3600 ; 1 hour +sig01 SIG NXT 1 3 3600 20000102030405 ( + 19961211100908 2143 foo + MxFcby9k/yvedMfQgKzhH5er0Mu/vILz45IkskceFGgi + WCn/GxHhai6VAuHAoNUz4YoU1tVfSCSqQYn6//11U6Nl + d80jEeC8aTrO+KKmCaY= ) +srv01 SRV 0 0 0 . +srv02 SRV 65535 65535 65535 old-slow-box.example.com. +$TTL 301 ; 5 minutes 1 second +t A 73.80.65.49 +$TTL 3600 ; 1 hour +txt01 TXT "foo" +txt02 TXT "foo" "bar" +txt03 TXT "foo" +txt04 TXT "foo" "bar" +txt05 TXT "foo bar" +txt06 TXT "foo bar" +txt07 TXT "foo bar" +txt08 TXT "foo\010bar" +txt09 TXT "foo\010bar" +txt10 TXT "foo bar" +txt11 TXT "\"foo\"" +txt12 TXT "\"foo\"" +$TTL 300 ; 5 minutes +u TXT "txt-not-in-nxt" +$ORIGIN u.example.nil. +a A 73.80.65.49 +b A 73.80.65.49 +$ORIGIN example.nil. +$TTL 3600 ; 1 hour +wks01 WKS 10.0.0.1 6 ( 0 1 2 21 23 ) +wks02 WKS 10.0.0.1 17 ( 0 1 2 53 ) +wks03 WKS 10.0.0.2 6 ( 65535 ) +x2501 X25 "123456789" diff --git a/bin/tests/system/tsig/ns1/named.conf b/bin/tests/system/tsig/ns1/named.conf new file mode 100644 index 00000000..943c99d1 --- /dev/null +++ b/bin/tests/system/tsig/ns1/named.conf @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2005, 2006 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: named.conf,v 1.2.2.2 2006/01/27 23:57:44 marka Exp $ */ + +controls { /* empty */ }; + +options { + query-source address 10.53.0.1; + notify-source 10.53.0.1; + transfer-source 10.53.0.1; + port 5300; + pid-file "named.pid"; + listen-on { 10.53.0.1; }; + listen-on-v6 { none; }; + recursion no; + notify no; +}; + +key "md5" { + secret "97rnFx24Tfna4mHPfgnerA=="; + algorithm hmac-md5; +}; + +key "sha1" { + secret "FrSt77yPTFx6hTs4i2tKLB9LmE0="; + algorithm hmac-sha1; +}; + +key "sha224" { + secret "hXfwwwiag2QGqblopofai9NuW28q/1rH4CaTnA=="; + algorithm hmac-sha224; +}; + +key "sha256" { + secret "R16NojROxtxH/xbDl//ehDsHm5DjWTQ2YXV+hGC2iBY="; + algorithm hmac-sha256; +}; + +key "sha384" { + secret "OaDdoAk2LAcLtYeUnsT7A9XHjsb6ZEma7OCvUpMraQIJX6HetGrlKmF7yglO1G2h"; + algorithm hmac-sha384; +}; + +key "sha512" { + secret "jI/Pa4qRu96t76Pns5Z/Ndxbn3QCkwcxLOgt9vgvnJw5wqTRvNyk3FtD6yIMd1dWVlqZ+Y4fe6Uasc0ckctEmg=="; + algorithm hmac-sha512; +}; + +key "md5-trunc" { + secret "97rnFx24Tfna4mHPfgnerA=="; + algorithm hmac-md5-80; +}; + +key "sha1-trunc" { + secret "FrSt77yPTFx6hTs4i2tKLB9LmE0="; + algorithm hmac-sha1-80; +}; + +key "sha224-trunc" { + secret "hXfwwwiag2QGqblopofai9NuW28q/1rH4CaTnA=="; + algorithm hmac-sha224-112; +}; + +key "sha256-trunc" { + secret "R16NojROxtxH/xbDl//ehDsHm5DjWTQ2YXV+hGC2iBY="; + algorithm hmac-sha256-128; +}; + +key "sha384-trunc" { + secret "OaDdoAk2LAcLtYeUnsT7A9XHjsb6ZEma7OCvUpMraQIJX6HetGrlKmF7yglO1G2h"; + algorithm hmac-sha384-192; +}; + +key "sha512-trunc" { + secret "jI/Pa4qRu96t76Pns5Z/Ndxbn3QCkwcxLOgt9vgvnJw5wqTRvNyk3FtD6yIMd1dWVlqZ+Y4fe6Uasc0ckctEmg=="; + algorithm hmac-sha512-256; +}; + +zone "example.nil" { + type master; + file "example.db"; +}; diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh new file mode 100644 index 00000000..11fbec55 --- /dev/null +++ b/bin/tests/system/tsig/tests.sh @@ -0,0 +1,218 @@ +#!/bin/sh +# +# Copyright (C) 2005, 2006 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: tests.sh,v 1.2.2.2 2006/01/27 23:57:44 marka Exp $ + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +# +# Shared secrets. +# +md5="97rnFx24Tfna4mHPfgnerA==" +sha1="FrSt77yPTFx6hTs4i2tKLB9LmE0=" +sha224="hXfwwwiag2QGqblopofai9NuW28q/1rH4CaTnA==" +sha256="R16NojROxtxH/xbDl//ehDsHm5DjWTQ2YXV+hGC2iBY=" +sha384="OaDdoAk2LAcLtYeUnsT7A9XHjsb6ZEma7OCvUpMraQIJX6HetGrlKmF7yglO1G2h" +sha512="jI/Pa4qRu96t76Pns5Z/Ndxbn3QCkwcxLOgt9vgvnJw5wqTRvNyk3FtD6yIMd1dWVlqZ+Y4fe6Uasc0ckctEmg==" + +status=0 + +echo "I:fetching using hmac-md5 (old form)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "md5:$md5" @10.53.0.1 soa -p 5300 > dig.out.md5.old || ret=1 +grep -i "md5.*TSIG.*NOERROR" dig.out.md5.old > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-md5 (new form)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-md5:md5:$md5" @10.53.0.1 soa -p 5300 > dig.out.md5.new || ret=1 +grep -i "md5.*TSIG.*NOERROR" dig.out.md5.new > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha1" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha1:sha1:$sha1" @10.53.0.1 soa -p 5300 > dig.out.sha1 || ret=1 +grep -i "sha1.*TSIG.*NOERROR" dig.out.sha1 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha224" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha224:sha224:$sha224" @10.53.0.1 soa -p 5300 > dig.out.sha224 || ret=1 +grep -i "sha224.*TSIG.*NOERROR" dig.out.sha224 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha256" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha256:sha256:$sha256" @10.53.0.1 soa -p 5300 > dig.out.sha256 || ret=1 +grep -i "sha256.*TSIG.*NOERROR" dig.out.sha256 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha384" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha384:sha384:$sha384" @10.53.0.1 soa -p 5300 > dig.out.sha384 || ret=1 +grep -i "sha384.*TSIG.*NOERROR" dig.out.sha384 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha512" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha512:sha512:$sha512" @10.53.0.1 soa -p 5300 > dig.out.sha512 || ret=1 +grep -i "sha512.*TSIG.*NOERROR" dig.out.sha512 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +# +# +# Truncated TSIG +# +# +echo "I:fetching using hmac-md5 (trunc)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-md5-80:md5-trunc:$md5" @10.53.0.1 soa -p 5300 > dig.out.md5.trunc || ret=1 +grep -i "md5-trunc.*TSIG.*NOERROR" dig.out.md5.trunc > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha1 (trunc)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha1-80:sha1-trunc:$sha1" @10.53.0.1 soa -p 5300 > dig.out.sha1.trunc || ret=1 +grep -i "sha1.*TSIG.*NOERROR" dig.out.sha1.trunc > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha224 (trunc)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha224-112:sha224-trunc:$sha224" @10.53.0.1 soa -p 5300 > dig.out.sha224.trunc || ret=1 +grep -i "sha224-trunc.*TSIG.*NOERROR" dig.out.sha224.trunc > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha256 (trunc)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha256-128:sha256-trunc:$sha256" @10.53.0.1 soa -p 5300 > dig.out.sha256.trunc || ret=1 +grep -i "sha256-trunc.*TSIG.*NOERROR" dig.out.sha256.trunc > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha384 (trunc)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha384-192:sha384-trunc:$sha384" @10.53.0.1 soa -p 5300 > dig.out.sha384.trunc || ret=1 +grep -i "sha384-trunc.*TSIG.*NOERROR" dig.out.sha384.trunc > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha512-256 (trunc)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha512-256:sha512-trunc:$sha512" @10.53.0.1 soa -p 5300 > dig.out.sha512.trunc || ret=1 +grep -i "sha512-trunc.*TSIG.*NOERROR" dig.out.sha512.trunc > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + + +# +# +# Check for bad truncation. +# +# +echo "I:fetching using hmac-md5-80 (BADTRUNC)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-md5-80:md5:$md5" @10.53.0.1 soa -p 5300 > dig.out.md5-80 || ret=1 +grep -i "md5.*TSIG.*BADTRUNC" dig.out.md5-80 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha1-80 (BADTRUNC)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha1-80:sha1:$sha1" @10.53.0.1 soa -p 5300 > dig.out.sha1-80 || ret=1 +grep -i "sha1.*TSIG.*BADTRUNC" dig.out.sha1-80 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha224-112 (BADTRUNC)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha224-112:sha224:$sha224" @10.53.0.1 soa -p 5300 > dig.out.sha224-112 || ret=1 +grep -i "sha224.*TSIG.*BADTRUNC" dig.out.sha224-112 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha256-128 (BADTRUNC)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha256-128:sha256:$sha256" @10.53.0.1 soa -p 5300 > dig.out.sha256-128 || ret=1 +grep -i "sha256.*TSIG.*BADTRUNC" dig.out.sha256-128 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha384-192 (BADTRUNC)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha384-192:sha384:$sha384" @10.53.0.1 soa -p 5300 > dig.out.sha384-192 || ret=1 +grep -i "sha384.*TSIG.*BADTRUNC" dig.out.sha384-192 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +echo "I:fetching using hmac-sha512-256 (BADTRUNC)" +ret=0 +$DIG +tcp +nosea +nostat +noquest +nocomm +nocmd example.nil.\ + -y "hmac-sha512-256:sha512:$sha512" @10.53.0.1 soa -p 5300 > dig.out.sha512-256 || ret=1 +grep -i "sha512.*TSIG.*BADTRUNC" dig.out.sha512-256 > /dev/null || ret=1 +if [ $ret -eq 1 ] ; then + echo "I: failed"; status=1 +fi + +exit $status + + diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh index 8a948205..384f2fcb 100644 --- a/bin/tests/system/unknown/clean.sh +++ b/bin/tests/system/unknown/clean.sh @@ -15,6 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.3.206.1 2004/03/06 10:22:35 marka Exp $ +# $Id: clean.sh,v 1.4 2004/03/05 05:03:18 marka Exp $ rm -f dig.out diff --git a/bin/tests/system/unknown/ns1/broken1.db b/bin/tests/system/unknown/ns1/broken1.db index a0d704d8..1c0ca5f2 100644 --- a/bin/tests/system/unknown/ns1/broken1.db +++ b/bin/tests/system/unknown/ns1/broken1.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: broken1.db,v 1.2.206.1 2004/03/06 10:22:36 marka Exp $ +; $Id: broken1.db,v 1.3 2004/03/05 05:03:20 marka Exp $ $TTL 300 ; 5 minutes @ SOA mname1. . ( diff --git a/bin/tests/system/unknown/ns1/broken2.db b/bin/tests/system/unknown/ns1/broken2.db index 220fad2b..504830e2 100644 --- a/bin/tests/system/unknown/ns1/broken2.db +++ b/bin/tests/system/unknown/ns1/broken2.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: broken2.db,v 1.2.206.1 2004/03/06 10:22:36 marka Exp $ +; $Id: broken2.db,v 1.3 2004/03/05 05:03:21 marka Exp $ $TTL 300 ; 5 minutes @ SOA mname1. . ( diff --git a/bin/tests/system/unknown/ns1/broken3.db b/bin/tests/system/unknown/ns1/broken3.db index 92d47198..a08e7c62 100644 --- a/bin/tests/system/unknown/ns1/broken3.db +++ b/bin/tests/system/unknown/ns1/broken3.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: broken3.db,v 1.2.206.1 2004/03/06 10:22:37 marka Exp $ +; $Id: broken3.db,v 1.3 2004/03/05 05:03:21 marka Exp $ $TTL 300 ; 5 minutes @ SOA mname1. . ( diff --git a/bin/tests/system/unknown/ns1/broken4.db b/bin/tests/system/unknown/ns1/broken4.db index e065bbc5..e48430c5 100644 --- a/bin/tests/system/unknown/ns1/broken4.db +++ b/bin/tests/system/unknown/ns1/broken4.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: broken4.db,v 1.3.206.1 2004/03/06 10:22:37 marka Exp $ +; $Id: broken4.db,v 1.4 2004/03/05 05:03:21 marka Exp $ $TTL 300 ; 5 minutes @ SOA mname1. . ( diff --git a/bin/tests/system/unknown/ns1/broken5.db b/bin/tests/system/unknown/ns1/broken5.db index bebbd7fa..e78119a1 100644 --- a/bin/tests/system/unknown/ns1/broken5.db +++ b/bin/tests/system/unknown/ns1/broken5.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: broken5.db,v 1.2.206.1 2004/03/06 10:22:37 marka Exp $ +; $Id: broken5.db,v 1.3 2004/03/05 05:03:21 marka Exp $ $TTL 300 ; 5 minutes @ SOA mname1. . ( diff --git a/bin/tests/system/unknown/ns1/class10.hints b/bin/tests/system/unknown/ns1/class10.hints index deb1b39c..18fa3446 100644 --- a/bin/tests/system/unknown/ns1/class10.hints +++ b/bin/tests/system/unknown/ns1/class10.hints @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: class10.hints,v 1.2.206.1 2004/03/06 10:22:37 marka Exp $ +; $Id: class10.hints,v 1.3 2004/03/05 05:03:21 marka Exp $ $TTL 3600 . NS ns. diff --git a/bin/tests/system/unknown/ns1/example-class10.db b/bin/tests/system/unknown/ns1/example-class10.db index 7b142d5f..f36e7722 100644 --- a/bin/tests/system/unknown/ns1/example-class10.db +++ b/bin/tests/system/unknown/ns1/example-class10.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example-class10.db,v 1.2.206.1 2004/03/06 10:22:38 marka Exp $ +; $Id: example-class10.db,v 1.3 2004/03/05 05:03:21 marka Exp $ $TTL 300 ; 5 minutes @ SOA mname1. . ( diff --git a/bin/tests/system/unknown/ns1/example-in.db b/bin/tests/system/unknown/ns1/example-in.db index 13faeaa4..b88c4cef 100644 --- a/bin/tests/system/unknown/ns1/example-in.db +++ b/bin/tests/system/unknown/ns1/example-in.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example-in.db,v 1.4.206.1 2004/03/06 10:22:38 marka Exp $ +; $Id: example-in.db,v 1.5 2004/03/05 05:03:21 marka Exp $ $TTL 300 ; 5 minutes @ SOA mname1. . ( diff --git a/bin/tests/system/unknown/ns1/named.conf b/bin/tests/system/unknown/ns1/named.conf index a3801fd1..9fdab429 100644 --- a/bin/tests/system/unknown/ns1/named.conf +++ b/bin/tests/system/unknown/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.7.206.2 2004/03/06 10:22:38 marka Exp $ */ +/* $Id: named.conf,v 1.9 2004/03/05 05:03:21 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh index 1c799c54..597fecc9 100644 --- a/bin/tests/system/unknown/tests.sh +++ b/bin/tests/system/unknown/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.7.206.1 2004/03/06 10:22:36 marka Exp $ +# $Id: tests.sh,v 1.8 2004/03/05 05:03:19 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh index e795faaf..bde8ddd8 100644 --- a/bin/tests/system/upforwd/clean.sh +++ b/bin/tests/system/upforwd/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.5.206.1 2004/03/06 10:22:38 marka Exp $ +# $Id: clean.sh,v 1.6 2004/03/05 05:03:24 marka Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/upforwd/ns1/example1.db b/bin/tests/system/upforwd/ns1/example1.db index cf9f4a96..da7f171f 100644 --- a/bin/tests/system/upforwd/ns1/example1.db +++ b/bin/tests/system/upforwd/ns1/example1.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example1.db,v 1.1.206.1 2004/03/06 10:22:39 marka Exp $ +; $Id: example1.db,v 1.2 2004/03/05 05:03:26 marka Exp $ @ 3600 SOA n1.example. hostmaster.ns1.example. ( 1 3600 1200 604800 7200 ) diff --git a/bin/tests/system/upforwd/ns1/named.conf b/bin/tests/system/upforwd/ns1/named.conf index 066461f8..b58db015 100644 --- a/bin/tests/system/upforwd/ns1/named.conf +++ b/bin/tests/system/upforwd/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.6.206.2 2004/03/06 10:22:39 marka Exp $ */ +/* $Id: named.conf,v 1.8 2004/03/05 05:03:26 marka Exp $ */ key "update.example." { algorithm "hmac-md5"; diff --git a/bin/tests/system/upforwd/ns2/named.conf b/bin/tests/system/upforwd/ns2/named.conf index fccff4ff..18160f29 100644 --- a/bin/tests/system/upforwd/ns2/named.conf +++ b/bin/tests/system/upforwd/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.5.206.2 2004/03/06 10:22:40 marka Exp $ */ +/* $Id: named.conf,v 1.7 2004/03/05 05:03:28 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/upforwd/ns3/named.conf b/bin/tests/system/upforwd/ns3/named.conf index 6d47e285..a678d589 100644 --- a/bin/tests/system/upforwd/ns3/named.conf +++ b/bin/tests/system/upforwd/ns3/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.5.206.2 2004/03/06 10:22:40 marka Exp $ */ +/* $Id: named.conf,v 1.7 2004/03/05 05:03:31 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh index fb61218d..fa8ed37d 100644 --- a/bin/tests/system/upforwd/setup.sh +++ b/bin/tests/system/upforwd/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.4.206.2 2004/03/10 01:05:55 marka Exp $ +# $Id: setup.sh,v 1.6 2004/03/10 01:06:05 marka Exp $ cp -f ns1/example1.db ns1/example.db rm -f ns1/example.db.jnl ns2/example.bk ns2/example.bk.jnl diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh index abab1855..f0556ca2 100644 --- a/bin/tests/system/upforwd/tests.sh +++ b/bin/tests/system/upforwd/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.7.206.1 2004/03/06 10:22:39 marka Exp $ +# $Id: tests.sh,v 1.8 2004/03/05 05:03:24 marka Exp $ # ns1 = stealth master # ns2 = slave with update forwarding disabled; not currently used diff --git a/bin/tests/system/v6synth/clean.sh b/bin/tests/system/v6synth/clean.sh index aac47206..7408fccc 100644 --- a/bin/tests/system/v6synth/clean.sh +++ b/bin/tests/system/v6synth/clean.sh @@ -15,6 +15,6 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.1.206.1 2004/03/06 10:22:40 marka Exp $ +# $Id: clean.sh,v 1.2 2004/03/05 05:03:33 marka Exp $ rm -f *.out diff --git a/bin/tests/system/v6synth/ns1/named.conf b/bin/tests/system/v6synth/ns1/named.conf index 6f648518..68d02be4 100644 --- a/bin/tests/system/v6synth/ns1/named.conf +++ b/bin/tests/system/v6synth/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.1.206.2 2004/03/06 10:22:41 marka Exp $ */ +/* $Id: named.conf,v 1.3 2004/03/05 05:03:35 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/v6synth/ns1/root.db b/bin/tests/system/v6synth/ns1/root.db index a1a6d78d..5eb211f2 100644 --- a/bin/tests/system/v6synth/ns1/root.db +++ b/bin/tests/system/v6synth/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.1.206.1 2004/03/06 10:22:41 marka Exp $ +; $Id: root.db,v 1.2 2004/03/05 05:03:35 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/v6synth/ns2/example.db b/bin/tests/system/v6synth/ns2/example.db index 60a0fad9..2bd72062 100644 --- a/bin/tests/system/v6synth/ns2/example.db +++ b/bin/tests/system/v6synth/ns2/example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.1.206.1 2004/03/06 10:22:42 marka Exp $ +; $Id: example.db,v 1.2 2004/03/05 05:03:38 marka Exp $ $TTL 86400 @ IN SOA ns2 hostmaster ( diff --git a/bin/tests/system/v6synth/ns2/ip6.arpa.db b/bin/tests/system/v6synth/ns2/ip6.arpa.db index 663d3b83..37d9aa2b 100644 --- a/bin/tests/system/v6synth/ns2/ip6.arpa.db +++ b/bin/tests/system/v6synth/ns2/ip6.arpa.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: ip6.arpa.db,v 1.1.22.3 2004/03/08 09:04:18 marka Exp $ +; $Id: ip6.arpa.db,v 1.3 2004/03/05 05:03:38 marka Exp $ $TTL 86400 @ IN SOA ns2 hostmaster ( diff --git a/bin/tests/system/v6synth/ns2/ip6.int.db b/bin/tests/system/v6synth/ns2/ip6.int.db index 4ab9ce34..f9ced208 100644 --- a/bin/tests/system/v6synth/ns2/ip6.int.db +++ b/bin/tests/system/v6synth/ns2/ip6.int.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: ip6.int.db,v 1.1.206.1 2004/03/06 10:22:42 marka Exp $ +; $Id: ip6.int.db,v 1.2 2004/03/05 05:03:38 marka Exp $ $TTL 86400 @ IN SOA ns2 hostmaster ( diff --git a/bin/tests/system/v6synth/ns2/named.conf b/bin/tests/system/v6synth/ns2/named.conf index 9e3703cd..6df9bb1e 100644 --- a/bin/tests/system/v6synth/ns2/named.conf +++ b/bin/tests/system/v6synth/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.1.206.2 2004/03/06 10:22:42 marka Exp $ */ +/* $Id: named.conf,v 1.3 2004/03/05 05:03:38 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/v6synth/ns3/named.conf b/bin/tests/system/v6synth/ns3/named.conf index e7450053..11856794 100644 --- a/bin/tests/system/v6synth/ns3/named.conf +++ b/bin/tests/system/v6synth/ns3/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.1.206.2 2004/03/06 10:22:43 marka Exp $ */ +/* $Id: named.conf,v 1.3 2004/03/05 05:03:40 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/v6synth/tests.sh b/bin/tests/system/v6synth/tests.sh index 61275863..89b80ede 100644 --- a/bin/tests/system/v6synth/tests.sh +++ b/bin/tests/system/v6synth/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.1.206.1 2004/03/06 10:22:41 marka Exp $ +# $Id: tests.sh,v 1.2 2004/03/05 05:03:33 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh index c52cf76d..5e0ee4a9 100644 --- a/bin/tests/system/views/clean.sh +++ b/bin/tests/system/views/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.7.206.4 2005/09/13 00:34:54 marka Exp $ +# $Id: clean.sh,v 1.9.18.2 2005/09/13 00:35:11 marka Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/views/ns1/named.conf b/bin/tests/system/views/ns1/named.conf index 470d7b01..530b6b9a 100644 --- a/bin/tests/system/views/ns1/named.conf +++ b/bin/tests/system/views/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.13.206.2 2004/03/06 10:22:44 marka Exp $ */ +/* $Id: named.conf,v 1.15 2004/03/05 05:03:46 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/views/ns1/root.db b/bin/tests/system/views/ns1/root.db index 45d6ca61..360b6f58 100644 --- a/bin/tests/system/views/ns1/root.db +++ b/bin/tests/system/views/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.6.206.1 2004/03/06 10:22:44 marka Exp $ +; $Id: root.db,v 1.7 2004/03/05 05:03:46 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/views/ns2/example1.db b/bin/tests/system/views/ns2/example1.db index db730a19..057e79e8 100644 --- a/bin/tests/system/views/ns2/example1.db +++ b/bin/tests/system/views/ns2/example1.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example1.db,v 1.6.206.1 2004/03/06 10:22:44 marka Exp $ +; $Id: example1.db,v 1.7 2004/03/05 05:03:48 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/views/ns2/example2.db b/bin/tests/system/views/ns2/example2.db index a8a0d10d..2119c1fc 100644 --- a/bin/tests/system/views/ns2/example2.db +++ b/bin/tests/system/views/ns2/example2.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example2.db,v 1.6.206.1 2004/03/06 10:22:44 marka Exp $ +; $Id: example2.db,v 1.7.18.1 2004/11/23 05:24:46 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes @@ -25,7 +25,7 @@ example IN SOA mname1. . ( 3600 ; minimum (1 hour) ) example. NS ns2.example. -ns0.example. A 10.53.0.4 +ns2.example. A 10.53.0.4 $ORIGIN example. a A 10.0.0.1 diff --git a/bin/tests/system/views/ns2/internal.db b/bin/tests/system/views/ns2/internal.db index 1e73b386..14892665 100644 --- a/bin/tests/system/views/ns2/internal.db +++ b/bin/tests/system/views/ns2/internal.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: internal.db,v 1.6.206.1 2004/03/06 10:22:45 marka Exp $ +; $Id: internal.db,v 1.7 2004/03/05 05:03:49 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/views/ns2/named1.conf b/bin/tests/system/views/ns2/named1.conf index 0c667ec7..b4c1b841 100644 --- a/bin/tests/system/views/ns2/named1.conf +++ b/bin/tests/system/views/ns2/named1.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named1.conf,v 1.16.206.2 2004/03/06 10:22:45 marka Exp $ */ +/* $Id: named1.conf,v 1.18 2004/03/05 05:03:49 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/views/ns2/named2.conf b/bin/tests/system/views/ns2/named2.conf index b59d761e..a79a4024 100644 --- a/bin/tests/system/views/ns2/named2.conf +++ b/bin/tests/system/views/ns2/named2.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named2.conf,v 1.18.206.2 2004/03/06 10:22:45 marka Exp $ */ +/* $Id: named2.conf,v 1.20 2004/03/05 05:03:49 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/views/ns3/internal.db b/bin/tests/system/views/ns3/internal.db index 0f58380a..27ae61f4 100644 --- a/bin/tests/system/views/ns3/internal.db +++ b/bin/tests/system/views/ns3/internal.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: internal.db,v 1.6.206.1 2004/03/06 10:22:45 marka Exp $ +; $Id: internal.db,v 1.7 2004/03/05 05:03:52 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/views/ns3/named1.conf b/bin/tests/system/views/ns3/named1.conf index 67b45498..ed9cedb2 100644 --- a/bin/tests/system/views/ns3/named1.conf +++ b/bin/tests/system/views/ns3/named1.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named1.conf,v 1.15.206.2 2004/03/06 10:22:46 marka Exp $ */ +/* $Id: named1.conf,v 1.17 2004/03/05 05:03:52 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/views/ns3/named2.conf b/bin/tests/system/views/ns3/named2.conf index ca1e30c7..0cfcb89f 100644 --- a/bin/tests/system/views/ns3/named2.conf +++ b/bin/tests/system/views/ns3/named2.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named2.conf,v 1.15.206.2 2004/03/06 10:22:46 marka Exp $ */ +/* $Id: named2.conf,v 1.17 2004/03/05 05:03:53 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh index 631540a5..e2fd03b1 100644 --- a/bin/tests/system/views/setup.sh +++ b/bin/tests/system/views/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.6.206.2 2004/03/10 01:05:56 marka Exp $ +# $Id: setup.sh,v 1.8 2004/03/10 01:06:06 marka Exp $ cp -f ns2/example1.db ns2/example.db diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh index 0f78b578..77e0d222 100644 --- a/bin/tests/system/views/tests.sh +++ b/bin/tests/system/views/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.26.206.2 2004/03/10 01:05:56 marka Exp $ +# $Id: tests.sh,v 1.28 2004/03/10 01:06:06 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/xfer/clean.sh b/bin/tests/system/xfer/clean.sh index c31b2608..2735fbf1 100644 --- a/bin/tests/system/xfer/clean.sh +++ b/bin/tests/system/xfer/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.9.12.3 2004/03/08 09:04:18 marka Exp $ +# $Id: clean.sh,v 1.11 2004/03/05 05:03:55 marka Exp $ # # Clean up after zone transfer tests. diff --git a/bin/tests/system/xfer/ns1/named.conf b/bin/tests/system/xfer/ns1/named.conf index 41821b3e..3e987cb4 100644 --- a/bin/tests/system/xfer/ns1/named.conf +++ b/bin/tests/system/xfer/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.14.206.2 2004/03/06 10:22:47 marka Exp $ */ +/* $Id: named.conf,v 1.16 2004/03/05 05:03:57 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/xfer/ns1/root.db b/bin/tests/system/xfer/ns1/root.db index f6026214..43b8f6f4 100644 --- a/bin/tests/system/xfer/ns1/root.db +++ b/bin/tests/system/xfer/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.6.12.3 2004/03/08 09:04:19 marka Exp $ +; $Id: root.db,v 1.8 2004/03/05 05:03:57 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/xfer/ns2/named.conf b/bin/tests/system/xfer/ns2/named.conf index 00616ff3..032e6aee 100644 --- a/bin/tests/system/xfer/ns2/named.conf +++ b/bin/tests/system/xfer/ns2/named.conf @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.15.12.4 2004/03/08 09:04:19 marka Exp $ */ +/* $Id: named.conf,v 1.18.18.3 2005/08/25 00:05:44 marka Exp $ */ controls { /* empty */ }; @@ -30,6 +30,7 @@ options { recursion no; notify yes; ixfr-from-differences yes; + check-integrity no; }; include "../../common/controls.conf"; diff --git a/bin/tests/system/xfer/ns3/named.conf b/bin/tests/system/xfer/ns3/named.conf index 9997c7dd..181dece4 100644 --- a/bin/tests/system/xfer/ns3/named.conf +++ b/bin/tests/system/xfer/ns3/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.15.12.4 2004/03/08 09:04:19 marka Exp $ */ +/* $Id: named.conf,v 1.18 2004/03/05 05:04:01 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh index 0deb4d96..965a36da 100644 --- a/bin/tests/system/xfer/setup.sh +++ b/bin/tests/system/xfer/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.2.224.3 2004/03/08 09:04:18 marka Exp $ +# $Id: setup.sh,v 1.3 2004/03/05 05:03:55 marka Exp $ sh ../genzone.sh 2 3 >ns2/example.db sh ../genzone.sh 2 3 >ns2/tsigzone.db diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh index fb48dabf..a8d9f4a6 100644 --- a/bin/tests/system/xfer/tests.sh +++ b/bin/tests/system/xfer/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.24.12.7 2005/11/03 00:02:54 marka Exp $ +# $Id: tests.sh,v 1.27.18.2 2005/11/03 00:02:55 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh index 12c44cf3..b4462237 100644 --- a/bin/tests/system/xferquota/clean.sh +++ b/bin/tests/system/xferquota/clean.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.8.206.4 2005/09/13 00:34:54 marka Exp $ +# $Id: clean.sh,v 1.10.18.2 2005/06/24 00:08:13 marka Exp $ # # Clean up after zone transfer quota tests. diff --git a/bin/tests/system/xferquota/ns1/changing1.db b/bin/tests/system/xferquota/ns1/changing1.db index 8262aea5..49d17efd 100644 --- a/bin/tests/system/xferquota/ns1/changing1.db +++ b/bin/tests/system/xferquota/ns1/changing1.db @@ -13,11 +13,11 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: changing1.db,v 1.6.206.1 2004/03/06 10:22:49 marka Exp $ +; $Id: changing1.db,v 1.7.18.1 2004/11/23 05:24:47 marka Exp $ $TTL 600 -@ IN SOA dns.changing. postmaster.changing. ( +@ IN SOA dns1.changing. postmaster.changing. ( 1 ;; serial 3600 ;; refresh period 1800 ;; retry interval diff --git a/bin/tests/system/xferquota/ns1/changing2.db b/bin/tests/system/xferquota/ns1/changing2.db index af18ead0..27967dcf 100644 --- a/bin/tests/system/xferquota/ns1/changing2.db +++ b/bin/tests/system/xferquota/ns1/changing2.db @@ -13,11 +13,11 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: changing2.db,v 1.6.206.1 2004/03/06 10:22:50 marka Exp $ +; $Id: changing2.db,v 1.7.18.1 2004/11/23 05:24:47 marka Exp $ $TTL 600 -@ IN SOA dns.changing. postmaster.changing. ( +@ IN SOA dns1.changing. postmaster.changing. ( 2 ;; serial 3600 ;; refresh period 1800 ;; retry interval diff --git a/bin/tests/system/xferquota/ns1/named.conf b/bin/tests/system/xferquota/ns1/named.conf index 5b09c7fd..23d31412 100644 --- a/bin/tests/system/xferquota/ns1/named.conf +++ b/bin/tests/system/xferquota/ns1/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.17.206.2 2004/03/06 10:22:50 marka Exp $ */ +/* $Id: named.conf,v 1.19 2004/03/05 05:04:06 marka Exp $ */ controls { /* empty */ }; diff --git a/bin/tests/system/xferquota/ns1/root.db b/bin/tests/system/xferquota/ns1/root.db index 11c3283d..546fc09e 100644 --- a/bin/tests/system/xferquota/ns1/root.db +++ b/bin/tests/system/xferquota/ns1/root.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: root.db,v 1.7.206.1 2004/03/06 10:22:50 marka Exp $ +; $Id: root.db,v 1.8 2004/03/05 05:04:06 marka Exp $ $TTL 300 . IN SOA gson.nominum.com. a.root.servers.nil. ( diff --git a/bin/tests/system/xferquota/ns2/example.db b/bin/tests/system/xferquota/ns2/example.db index f1ba7dbf..47be735c 100644 --- a/bin/tests/system/xferquota/ns2/example.db +++ b/bin/tests/system/xferquota/ns2/example.db @@ -13,7 +13,7 @@ ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ; PERFORMANCE OF THIS SOFTWARE. -; $Id: example.db,v 1.6.12.5 2004/03/08 09:04:20 marka Exp $ +; $Id: example.db,v 1.10 2004/03/05 05:04:07 marka Exp $ $ORIGIN . $TTL 300 ; 5 minutes diff --git a/bin/tests/system/xferquota/ns2/named.conf b/bin/tests/system/xferquota/ns2/named.conf index 26d7077f..bf2838e9 100644 --- a/bin/tests/system/xferquota/ns2/named.conf +++ b/bin/tests/system/xferquota/ns2/named.conf @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: named.conf,v 1.17.206.2 2004/03/06 10:22:51 marka Exp $ */ +/* $Id: named.conf,v 1.19.18.1 2004/11/23 05:24:47 marka Exp $ */ controls { /* empty */ }; @@ -28,7 +28,7 @@ options { listen-on { 10.53.0.2; }; listen-on-v6 { none; }; recursion no; - notify yes; + notify no; transfers-in 5; transfers-per-ns 5; diff --git a/bin/tests/system/xferquota/setup.pl b/bin/tests/system/xferquota/setup.pl index 7109508a..3b8f9c5a 100644 --- a/bin/tests/system/xferquota/setup.pl +++ b/bin/tests/system/xferquota/setup.pl @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.pl,v 1.10.206.1 2004/03/06 10:22:49 marka Exp $ +# $Id: setup.pl,v 1.11.18.1 2004/11/23 05:24:46 marka Exp $ # # Set up test data for zone transfer quota tests. @@ -32,9 +32,11 @@ for ($z = 0; $z < 300; $z++) { my $fn = "ns1/$zn.db"; my $f = new FileHandle($fn, "w") or die "open: $fn: $!"; print $f "\$TTL 300 -\@ IN SOA . . 1 300 120 3600 86400 +\@ IN SOA ns1 . 1 300 120 3600 86400 NS ns1 NS ns2 +ns1 A 10.53.0.1 +ns2 A 10.53.0.2 MX 10 mail1.isp.example. MX 20 mail2.isp.example. www A 10.0.0.1 diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh index 13d4e31a..ca932b66 100644 --- a/bin/tests/system/xferquota/setup.sh +++ b/bin/tests/system/xferquota/setup.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: setup.sh,v 1.11.206.2 2004/03/10 01:05:57 marka Exp $ +# $Id: setup.sh,v 1.13 2004/03/10 01:06:06 marka Exp $ # # Set up test data for zone transfer quota tests. diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh index 514cf6f7..872ea565 100644 --- a/bin/tests/system/xferquota/tests.sh +++ b/bin/tests/system/xferquota/tests.sh @@ -15,7 +15,7 @@ # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -# $Id: tests.sh,v 1.20.206.2 2004/03/10 01:05:57 marka Exp $ +# $Id: tests.sh,v 1.22.18.1 2004/11/23 05:24:46 marka Exp $ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh @@ -55,7 +55,7 @@ grep ";" dig.out.ns2 $PERL ../digcomp.pl dig.out.ns1 dig.out.ns2 || status=1 -sleep 5 +sleep 15 $DIG +tcp +noadd +nosea +nostat +noquest +nocomm +nocmd \ a.changing. @10.53.0.1 a -p 5300 > dig.out.ns1 || status=1 diff --git a/bin/tests/system/zonechecks/a.db b/bin/tests/system/zonechecks/a.db new file mode 100644 index 00000000..b0605c68 --- /dev/null +++ b/bin/tests/system/zonechecks/a.db @@ -0,0 +1,19 @@ +; Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: a.db,v 1.2.2.2 2004/11/24 23:49:16 marka Exp $ + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS 127.0.0.1 +127.0.0.1 3600 IN A 127.0.0.1 diff --git a/bin/tests/system/zonechecks/aaaa.db b/bin/tests/system/zonechecks/aaaa.db new file mode 100644 index 00000000..ce77286b --- /dev/null +++ b/bin/tests/system/zonechecks/aaaa.db @@ -0,0 +1,19 @@ +; Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: aaaa.db,v 1.2.2.2 2004/11/24 23:49:16 marka Exp $ + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ::1 +::1 3600 IN AAAA ::1 diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh new file mode 100644 index 00000000..4b29d5d1 --- /dev/null +++ b/bin/tests/system/zonechecks/clean.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: clean.sh,v 1.2.2.2 2004/11/24 23:49:17 marka Exp $ + +rm -f *.out diff --git a/bin/tests/system/zonechecks/cname.db b/bin/tests/system/zonechecks/cname.db new file mode 100644 index 00000000..ad211dcf --- /dev/null +++ b/bin/tests/system/zonechecks/cname.db @@ -0,0 +1,19 @@ +; Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: cname.db,v 1.2.2.2 2004/11/24 23:49:17 marka Exp $ + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ns +ns 3600 IN CNAME @ diff --git a/bin/tests/system/zonechecks/dname.db b/bin/tests/system/zonechecks/dname.db new file mode 100644 index 00000000..6fbb7b2c --- /dev/null +++ b/bin/tests/system/zonechecks/dname.db @@ -0,0 +1,19 @@ +; Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: dname.db,v 1.2.2.2 2004/11/24 23:49:17 marka Exp $ + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ns +@ 3600 IN DNAME . diff --git a/bin/tests/system/zonechecks/noaddress.db b/bin/tests/system/zonechecks/noaddress.db new file mode 100644 index 00000000..2a7f1b6f --- /dev/null +++ b/bin/tests/system/zonechecks/noaddress.db @@ -0,0 +1,19 @@ +; Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: noaddress.db,v 1.2.2.2 2004/11/24 23:49:17 marka Exp $ + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ns +ns 3600 IN TXT this name has no address records diff --git a/bin/tests/system/zonechecks/nxdomain.db b/bin/tests/system/zonechecks/nxdomain.db new file mode 100644 index 00000000..186f6472 --- /dev/null +++ b/bin/tests/system/zonechecks/nxdomain.db @@ -0,0 +1,19 @@ +; Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +; +; Permission to use, copy, modify, and distribute this software for any +; purpose with or without fee is hereby granted, provided that the above +; copyright notice and this permission notice appear in all copies. +; +; THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +; REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +; AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +; INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +; LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +; PERFORMANCE OF THIS SOFTWARE. + +; $Id: nxdomain.db,v 1.2.2.2 2004/11/24 23:49:17 marka Exp $ + +@ 3600 IN SOA ns hostmaster 1 3600 1200 604800 3600 +@ 3600 IN NS ns +; There are no records at all with the ownername of "ns". diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh new file mode 100644 index 00000000..28a7a955 --- /dev/null +++ b/bin/tests/system/zonechecks/tests.sh @@ -0,0 +1,164 @@ +#!/bin/sh +# +# Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. + +# $Id: tests.sh,v 1.2.2.1 2004/11/23 05:24:49 marka Exp $ + +SYSTEMTESTTOP=.. +. $SYSTEMTESTTOP/conf.sh + +status=0 + +# +echo "I: checking that we detect a NS which refers to a CNAME" +if $CHECKZONE . cname.db > cname.out 2>&1 +then + echo "I:failed (status)"; status=1 +else + if grep "is a CNAME" cname.out > /dev/null + then + : + else + echo "I:failed (message)"; status=1 + fi +fi + +# +echo "I: checking that we detect a NS which is below a DNAME" +if $CHECKZONE . dname.db > dname.out 2>&1 +then + echo "I:failed (status)"; status=1 +else + if grep "is below a DNAME" dname.out > /dev/null + then + : + else + echo "I:failed (message)"; status=1 + fi +fi + +# +echo "I: checking that we detect a NS which has no address records (A/AAAA)" +if $CHECKZONE . noaddress.db > noaddress.out +then + echo "I:failed (status)"; status=1 +else + if grep "has no address records" noaddress.out > /dev/null + then + : + else + echo "I:failed (message)"; status=1 + fi +fi + +# +echo "I: checking that we detect a NS which has no records" +if $CHECKZONE . nxdomain.db > nxdomain.out +then + echo "I:failed (status)"; status=1 +else + if grep "has no address records" noaddress.out > /dev/null + then + : + else + echo "I:failed (message)"; status=1 + fi +fi + +# +echo "I: checking that we detect a NS which looks like a A record (fail)" +if $CHECKZONE -n fail . a.db > a.out 2>&1 +then + echo "I:failed (status)"; status=1 +else + if grep "appears to be an address" a.out > /dev/null + then + : + else + echo "I:failed (message)"; status=1 + fi +fi + +# +echo "I: checking that we detect a NS which looks like a A record (warn=default)" +if $CHECKZONE . a.db > a.out 2>&1 +then + if grep "appears to be an address" a.out > /dev/null + then + : + else + echo "I:failed (message)"; status=1 + fi +else + echo "I:failed (status)"; status=1 +fi + +# +echo "I: checking that we detect a NS which looks like a A record (ignore)" +if $CHECKZONE -n ignore . a.db > a.out 2>&1 +then + if grep "appears to be an address" a.out > /dev/null + then + echo "I:failed (message)"; status=1 + else + : + fi +else + echo "I:failed (status)"; status=1 +fi + +# +echo "I: checking that we detect a NS which looks like a AAAA record (fail)" +if $CHECKZONE -n fail . aaaa.db > aaaa.out 2>&1 +then + echo "I:failed (status)"; status=1 +else + if grep "appears to be an address" aaaa.out > /dev/null + then + : + else + echo "I:failed (message)"; status=1 + fi +fi + +# +echo "I: checking that we detect a NS which looks like a AAAA record (warn=default)" +if $CHECKZONE . aaaa.db > aaaa.out 2>&1 +then + if grep "appears to be an address" aaaa.out > /dev/null + then + : + else + echo "I:failed (message)"; status=1 + fi +else + echo "I:failed (status)"; status=1 +fi + +# +echo "I: checking that we detect a NS which looks like a AAAA record (ignore)" +if $CHECKZONE -n ignore . aaaa.db > aaaa.out 2>&1 +then + if grep "appears to be an address" aaaa.out > /dev/null + then + echo "I:failed (message)"; status=1 + else + : + fi +else + echo "I:failed (status)"; status=1 +fi +echo "I:exit status: $status" +exit $? |