[svn] commit: r1898 - in /branches/tingting-loadzone/src/bin/loadzone/tests: correct/ error/
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri May 21 10:49:50 UTC 2010
Author: shentingting
Date: Fri May 21 10:49:49 2010
New Revision: 1898
Log:
remove unused 0A at the end of each line in the file
Modified:
branches/tingting-loadzone/src/bin/loadzone/tests/correct/clean.sh
branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct.dig.out
branches/tingting-loadzone/src/bin/loadzone/tests/correct/inclsub.db
branches/tingting-loadzone/src/bin/loadzone/tests/correct/include.db
branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.dig.out
branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1.db
branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1sub1.db
branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1sub2.db
branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2.db
branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2sub1.txt
branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2sub2.txt
branches/tingting-loadzone/src/bin/loadzone/tests/correct/tests.sh
branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl1.db
branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl2.db
branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttlext.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/error.known
branches/tingting-loadzone/src/bin/loadzone/tests/error/error.out
branches/tingting-loadzone/src/bin/loadzone/tests/error/error.sh
branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr1.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr2.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr3.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr4.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr5.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/include.txt
branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror1.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror2.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror3.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/nofilenane.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/originerr1.db
branches/tingting-loadzone/src/bin/loadzone/tests/error/originerr2.db
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/clean.sh
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/clean.sh (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/clean.sh Fri May 21 10:49:49 2010
@@ -1,3 +1,3 @@
-#!/bin/sh
-rm -f /usr/local/var/bind10-devel/zone.sqlite3
-rm -f dig.out
+#!/bin/sh
+rm -f /usr/local/var/bind10-devel/zone.sqlite3
+rm -f dig.out
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct.dig.out
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct.dig.out (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct.dig.out Fri May 21 10:49:49 2010
@@ -1,74 +1,74 @@
-include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600
-include. 300 IN NS ns.include.
-ns.include. 300 IN A 127.0.0.1
-a.include. 300 IN A 10.0.0.1
-a.sub.include. 300 IN A 10.0.1.1
-b.foo.sub.include. 300 IN A 10.0.2.2
-a.include. 300 IN A 99.99.99.99
-b.include. 300 IN A 10.0.0.2
-a.b.include. 300 IN A 10.0.1.1
-b.foo.b.include. 300 IN A 10.0.2.2
-b.include. 300 IN A 10.0.0.99
-c.b.include. 300 IN A 10.0.0.3
-include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600
-ttl1. 3 IN SOA ns.ttl1. hostmaster.ttl1. 1 3600 1800 1814400 3
-ttl1. 3 IN NS ns.ttl1.
-ns.ttl1. 3 IN A 10.53.0.1
-a.ttl1. 3 IN TXT "soa minttl 3"
-b.ttl1. 2 IN TXT "explicit ttl 2"
-c.ttl1. 3 IN TXT "soa minttl 3"
-d.ttl1. 1 IN TXT "default ttl 1"
-e.ttl1. 4 IN TXT "explicit ttl 4"
-f.ttl1. 1 IN TXT "default ttl 1"
-ttl1. 3 IN SOA ns.ttl1. hostmaster.ttl1. 1 3600 1800 1814400 3
-ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3
-ttl2. 1 IN NS ns.ttl2.
-ns.ttl2. 1 IN A 10.53.0.1
-a.ttl2. 1 IN TXT "inherited ttl 1"
-b.ttl2. 2 IN TXT "explicit ttl 2"
-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"
-ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3
-mix1. 3 IN SOA ns.mix1. hostmaster.mix1. 1 3600 1800 1814400 3
-mix1. 3 IN NS ns.mix1.
-ns.mix1. 3 IN A 10.53.0.1
-a.mix1. 3 IN TXT "soa minttl 3"
-b.mix1. 2 IN TXT "explicit ttl 2"
-a.mix1. 3 IN TXT "soa minttl 3"
-b.foo.mix1. 3 IN TXT "soa minttl 3"
-c.mix1. 3 IN TXT "soa minttl 3"
-d.mix1. 1 IN TXT "default ttl 1"
-e.mix1. 4 IN TXT "explicit ttl 4"
-f.mix1. 1 IN TXT "default ttl 1"
-i.mix1. 1 IN TXT "default ttl 1"
-g.mix1. 5 IN TXT "default ttl 5"
-h.mix1. 5 IN TXT "the include ttl 5"
-mix1. 3 IN SOA ns.mix1. hostmaster.mix1. 1 3600 1800 1814400 3
-mix2. 1 IN SOA ns.mix2. hostmaster.mix2. 1 3600 1800 1814400 3
-mix2. 1 IN NS ns.mix2.
-ns.mix2. 1 IN A 10.53.0.1
-a.mix2. 1 IN TXT "inherited ttl 1"
-h.mix2. 1 IN TXT "inherited ttl 1"
-g.mix2. 6 IN TXT "inherited ttl 6"
-b.mix2. 6 IN TXT "explicit ttl 6"
-c.mix2. 2 IN TXT "inherited ttl 2"
-m.mix2. 6 IN TXT "explicit ttl 6"
-d.mix2. 3 IN TXT "default ttl 3"
-e.mix2. 2 IN TXT "explicit ttl 2"
-n.mix2. 3 IN TXT "default ttl 3"
-f.mix2. 3 IN TXT "default ttl 3"
-g.mix2. 5 IN TXT "default ttl 5"
-f.mix2. 5 IN TXT "default ttl 5"
-mix2. 1 IN SOA ns.mix2. hostmaster.mix2. 1 3600 1800 1814400 3
-ttlext. 3 IN SOA ns.ttlext. hostmaster.ttlext. 1 3600 1800 1814400 3
-ttlext. 3 IN NS ns.ttlext.
-ns.ttlext. 3 IN A 10.53.0.1
-a.ttlext. 3 IN TXT "soa minttl 3"
-b.ttlext. 2 IN TXT "explicit ttl 2"
-c.ttlext. 3 IN TXT "soa minttl 3"
-d.ttlext. 600 IN TXT "default ttl 600"
-e.ttlext. 4 IN TXT "explicit ttl 4"
-f.ttlext. 600 IN TXT "default ttl 600"
-ttlext. 3 IN SOA ns.ttlext. hostmaster.ttlext. 1 3600 1800 1814400 3
+include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600
+include. 300 IN NS ns.include.
+ns.include. 300 IN A 127.0.0.1
+a.include. 300 IN A 10.0.0.1
+a.sub.include. 300 IN A 10.0.1.1
+b.foo.sub.include. 300 IN A 10.0.2.2
+a.include. 300 IN A 99.99.99.99
+b.include. 300 IN A 10.0.0.2
+a.b.include. 300 IN A 10.0.1.1
+b.foo.b.include. 300 IN A 10.0.2.2
+b.include. 300 IN A 10.0.0.99
+c.b.include. 300 IN A 10.0.0.3
+include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600
+ttl1. 3 IN SOA ns.ttl1. hostmaster.ttl1. 1 3600 1800 1814400 3
+ttl1. 3 IN NS ns.ttl1.
+ns.ttl1. 3 IN A 10.53.0.1
+a.ttl1. 3 IN TXT "soa minttl 3"
+b.ttl1. 2 IN TXT "explicit ttl 2"
+c.ttl1. 3 IN TXT "soa minttl 3"
+d.ttl1. 1 IN TXT "default ttl 1"
+e.ttl1. 4 IN TXT "explicit ttl 4"
+f.ttl1. 1 IN TXT "default ttl 1"
+ttl1. 3 IN SOA ns.ttl1. hostmaster.ttl1. 1 3600 1800 1814400 3
+ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3
+ttl2. 1 IN NS ns.ttl2.
+ns.ttl2. 1 IN A 10.53.0.1
+a.ttl2. 1 IN TXT "inherited ttl 1"
+b.ttl2. 2 IN TXT "explicit ttl 2"
+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"
+ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3
+mix1. 3 IN SOA ns.mix1. hostmaster.mix1. 1 3600 1800 1814400 3
+mix1. 3 IN NS ns.mix1.
+ns.mix1. 3 IN A 10.53.0.1
+a.mix1. 3 IN TXT "soa minttl 3"
+b.mix1. 2 IN TXT "explicit ttl 2"
+a.mix1. 3 IN TXT "soa minttl 3"
+b.foo.mix1. 3 IN TXT "soa minttl 3"
+c.mix1. 3 IN TXT "soa minttl 3"
+d.mix1. 1 IN TXT "default ttl 1"
+e.mix1. 4 IN TXT "explicit ttl 4"
+f.mix1. 1 IN TXT "default ttl 1"
+i.mix1. 1 IN TXT "default ttl 1"
+g.mix1. 5 IN TXT "default ttl 5"
+h.mix1. 5 IN TXT "the include ttl 5"
+mix1. 3 IN SOA ns.mix1. hostmaster.mix1. 1 3600 1800 1814400 3
+mix2. 1 IN SOA ns.mix2. hostmaster.mix2. 1 3600 1800 1814400 3
+mix2. 1 IN NS ns.mix2.
+ns.mix2. 1 IN A 10.53.0.1
+a.mix2. 1 IN TXT "inherited ttl 1"
+h.mix2. 1 IN TXT "inherited ttl 1"
+g.mix2. 6 IN TXT "inherited ttl 6"
+b.mix2. 6 IN TXT "explicit ttl 6"
+c.mix2. 2 IN TXT "inherited ttl 2"
+m.mix2. 6 IN TXT "explicit ttl 6"
+d.mix2. 3 IN TXT "default ttl 3"
+e.mix2. 2 IN TXT "explicit ttl 2"
+n.mix2. 3 IN TXT "default ttl 3"
+f.mix2. 3 IN TXT "default ttl 3"
+g.mix2. 5 IN TXT "default ttl 5"
+f.mix2. 5 IN TXT "default ttl 5"
+mix2. 1 IN SOA ns.mix2. hostmaster.mix2. 1 3600 1800 1814400 3
+ttlext. 3 IN SOA ns.ttlext. hostmaster.ttlext. 1 3600 1800 1814400 3
+ttlext. 3 IN NS ns.ttlext.
+ns.ttlext. 3 IN A 10.53.0.1
+a.ttlext. 3 IN TXT "soa minttl 3"
+b.ttlext. 2 IN TXT "explicit ttl 2"
+c.ttlext. 3 IN TXT "soa minttl 3"
+d.ttlext. 600 IN TXT "default ttl 600"
+e.ttlext. 4 IN TXT "explicit ttl 4"
+f.ttlext. 600 IN TXT "default ttl 600"
+ttlext. 3 IN SOA ns.ttlext. hostmaster.ttlext. 1 3600 1800 1814400 3
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/inclsub.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/inclsub.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/inclsub.db Fri May 21 10:49:49 2010
@@ -1,4 +1,4 @@
-a 300 A 10.0.1.1
-$ORIGIN foo
-b 300 A 10.0.2.2
-
+a 300 A 10.0.1.1
+$ORIGIN foo
+b 300 A 10.0.2.2
+
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/include.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/include.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/include.db Fri May 21 10:49:49 2010
@@ -1,23 +1,23 @@
-$ORIGIN include. ; initialize origin
-$TTL 300
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-
-ns A 127.0.0.1
-
-a A 10.0.0.1
-$INCLUDE inclsub.db sub ; a.include. is the relative domain name origin for the included file
-; use the current domain name
- A 99.99.99.99
-b A 10.0.0.2
-$ORIGIN b
-$INCLUDE inclsub.db
-; use the current domain name
- A 10.0.0.99
-c A 10.0.0.3
+$ORIGIN include. ; initialize origin
+$TTL 300
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+
+ns A 127.0.0.1
+
+a A 10.0.0.1
+$INCLUDE inclsub.db sub ; a.include. is the relative domain name origin for the included file
+; use the current domain name
+ A 99.99.99.99
+b A 10.0.0.2
+$ORIGIN b
+$INCLUDE inclsub.db
+; use the current domain name
+ A 10.0.0.99
+c A 10.0.0.3
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.dig.out
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.dig.out (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.dig.out Fri May 21 10:49:49 2010
@@ -1,74 +1,74 @@
-include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600
-include. 300 IN NS ns.include.
-ns.include. 300 IN A 127.0.0.1
-a.include. 300 IN A 10.0.0.1
-a.sub.include. 300 IN A 10.0.1.1
-b.foo.sub.include. 300 IN A 10.0.2.2
-a.include. 300 IN A 99.99.99.99
-b.include. 300 IN A 10.0.0.2
-a.b.include. 300 IN A 10.0.1.1
-b.foo.b.include. 300 IN A 10.0.2.2
-b.include. 300 IN A 10.0.0.99
-c.b.include. 300 IN A 10.0.0.3
-include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600
-ttl1. 3 IN SOA ns.ttl1. hostmaster.ttl1. 1 3600 1800 1814400 3
-ttl1. 3 IN NS ns.ttl1.
-ns.ttl1. 3 IN A 10.53.0.1
-a.ttl1. 3 IN TXT "soa minttl 3"
-b.ttl1. 2 IN TXT "explicit ttl 2"
-c.ttl1. 3 IN TXT "soa minttl 3"
-d.ttl1. 1 IN TXT "default ttl 1"
-e.ttl1. 4 IN TXT "explicit ttl 4"
-f.ttl1. 1 IN TXT "default ttl 1"
-ttl1. 3 IN SOA ns.ttl1. hostmaster.ttl1. 1 3600 1800 1814400 3
-ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3
-ttl2. 1 IN NS ns.ttl2.
-ns.ttl2. 1 IN A 10.53.0.1
-a.ttl2. 1 IN TXT "inherited ttl 1"
-b.ttl2. 2 IN TXT "explicit ttl 2"
-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"
-ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3
-mix1. 3 IN SOA ns.mix1. hostmaster.mix1. 1 3600 1800 1814400 3
-mix1. 3 IN NS ns.mix1.
-ns.mix1. 3 IN A 10.53.0.1
-a.mix1. 3 IN TXT "soa minttl 3"
-b.mix1. 2 IN TXT "explicit ttl 2"
-a.mix1. 3 IN TXT "soa minttl 3"
-b.foo.mix1. 3 IN TXT "soa minttl 3"
-c.mix1. 3 IN TXT "soa minttl 3"
-d.mix1. 1 IN TXT "default ttl 1"
-e.mix1. 4 IN TXT "explicit ttl 4"
-f.mix1. 1 IN TXT "default ttl 1"
-i.mix1. 1 IN TXT "default ttl 1"
-g.mix1. 5 IN TXT "default ttl 5"
-h.mix1. 5 IN TXT "the include ttl 5"
-mix1. 3 IN SOA ns.mix1. hostmaster.mix1. 1 3600 1800 1814400 3
-mix2. 1 IN SOA ns.mix2. hostmaster.mix2. 1 3600 1800 1814400 3
-mix2. 1 IN NS ns.mix2.
-ns.mix2. 1 IN A 10.53.0.1
-a.mix2. 1 IN TXT "inherited ttl 1"
-h.mix2. 1 IN TXT "inherited ttl 1"
-g.mix2. 6 IN TXT "inherited ttl 6"
-b.mix2. 6 IN TXT "explicit ttl 6"
-c.mix2. 2 IN TXT "inherited ttl 2"
-m.mix2. 6 IN TXT "explicit ttl 6"
-d.mix2. 3 IN TXT "default ttl 3"
-e.mix2. 2 IN TXT "explicit ttl 2"
-n.mix2. 3 IN TXT "default ttl 3"
-f.mix2. 3 IN TXT "default ttl 3"
-g.mix2. 5 IN TXT "default ttl 5"
-f.mix2. 5 IN TXT "default ttl 5"
-mix2. 1 IN SOA ns.mix2. hostmaster.mix2. 1 3600 1800 1814400 3
-ttlext. 3 IN SOA ns.ttlext. hostmaster.ttlext. 1 3600 1800 1814400 3
-ttlext. 3 IN NS ns.ttlext.
-ns.ttlext. 3 IN A 10.53.0.1
-a.ttlext. 3 IN TXT "soa minttl 3"
-b.ttlext. 2 IN TXT "explicit ttl 2"
-c.ttlext. 3 IN TXT "soa minttl 3"
-d.ttlext. 600 IN TXT "default ttl 600"
-e.ttlext. 4 IN TXT "explicit ttl 4"
-f.ttlext. 600 IN TXT "default ttl 600"
-ttlext. 3 IN SOA ns.ttlext. hostmaster.ttlext. 1 3600 1800 1814400 3
+include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600
+include. 300 IN NS ns.include.
+ns.include. 300 IN A 127.0.0.1
+a.include. 300 IN A 10.0.0.1
+a.sub.include. 300 IN A 10.0.1.1
+b.foo.sub.include. 300 IN A 10.0.2.2
+a.include. 300 IN A 99.99.99.99
+b.include. 300 IN A 10.0.0.2
+a.b.include. 300 IN A 10.0.1.1
+b.foo.b.include. 300 IN A 10.0.2.2
+b.include. 300 IN A 10.0.0.99
+c.b.include. 300 IN A 10.0.0.3
+include. 300 IN SOA ns.include. hostmaster.include. 1 3600 1800 1814400 3600
+ttl1. 3 IN SOA ns.ttl1. hostmaster.ttl1. 1 3600 1800 1814400 3
+ttl1. 3 IN NS ns.ttl1.
+ns.ttl1. 3 IN A 10.53.0.1
+a.ttl1. 3 IN TXT "soa minttl 3"
+b.ttl1. 2 IN TXT "explicit ttl 2"
+c.ttl1. 3 IN TXT "soa minttl 3"
+d.ttl1. 1 IN TXT "default ttl 1"
+e.ttl1. 4 IN TXT "explicit ttl 4"
+f.ttl1. 1 IN TXT "default ttl 1"
+ttl1. 3 IN SOA ns.ttl1. hostmaster.ttl1. 1 3600 1800 1814400 3
+ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3
+ttl2. 1 IN NS ns.ttl2.
+ns.ttl2. 1 IN A 10.53.0.1
+a.ttl2. 1 IN TXT "inherited ttl 1"
+b.ttl2. 2 IN TXT "explicit ttl 2"
+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"
+ttl2. 1 IN SOA ns.ttl2. hostmaster.ttl2. 1 3600 1800 1814400 3
+mix1. 3 IN SOA ns.mix1. hostmaster.mix1. 1 3600 1800 1814400 3
+mix1. 3 IN NS ns.mix1.
+ns.mix1. 3 IN A 10.53.0.1
+a.mix1. 3 IN TXT "soa minttl 3"
+b.mix1. 2 IN TXT "explicit ttl 2"
+a.mix1. 3 IN TXT "soa minttl 3"
+b.foo.mix1. 3 IN TXT "soa minttl 3"
+c.mix1. 3 IN TXT "soa minttl 3"
+d.mix1. 1 IN TXT "default ttl 1"
+e.mix1. 4 IN TXT "explicit ttl 4"
+f.mix1. 1 IN TXT "default ttl 1"
+i.mix1. 1 IN TXT "default ttl 1"
+g.mix1. 5 IN TXT "default ttl 5"
+h.mix1. 5 IN TXT "the include ttl 5"
+mix1. 3 IN SOA ns.mix1. hostmaster.mix1. 1 3600 1800 1814400 3
+mix2. 1 IN SOA ns.mix2. hostmaster.mix2. 1 3600 1800 1814400 3
+mix2. 1 IN NS ns.mix2.
+ns.mix2. 1 IN A 10.53.0.1
+a.mix2. 1 IN TXT "inherited ttl 1"
+h.mix2. 1 IN TXT "inherited ttl 1"
+g.mix2. 6 IN TXT "inherited ttl 6"
+b.mix2. 6 IN TXT "explicit ttl 6"
+c.mix2. 2 IN TXT "inherited ttl 2"
+m.mix2. 6 IN TXT "explicit ttl 6"
+d.mix2. 3 IN TXT "default ttl 3"
+e.mix2. 2 IN TXT "explicit ttl 2"
+n.mix2. 3 IN TXT "default ttl 3"
+f.mix2. 3 IN TXT "default ttl 3"
+g.mix2. 5 IN TXT "default ttl 5"
+f.mix2. 5 IN TXT "default ttl 5"
+mix2. 1 IN SOA ns.mix2. hostmaster.mix2. 1 3600 1800 1814400 3
+ttlext. 3 IN SOA ns.ttlext. hostmaster.ttlext. 1 3600 1800 1814400 3
+ttlext. 3 IN NS ns.ttlext.
+ns.ttlext. 3 IN A 10.53.0.1
+a.ttlext. 3 IN TXT "soa minttl 3"
+b.ttlext. 2 IN TXT "explicit ttl 2"
+c.ttlext. 3 IN TXT "soa minttl 3"
+d.ttlext. 600 IN TXT "default ttl 600"
+e.ttlext. 4 IN TXT "explicit ttl 4"
+f.ttlext. 600 IN TXT "default ttl 600"
+ttlext. 3 IN SOA ns.ttlext. hostmaster.ttlext. 1 3600 1800 1814400 3
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1.db Fri May 21 10:49:49 2010
@@ -1,21 +1,21 @@
-; $Id: ttl1.db,v 1.6 2007/06/19 23:47:04 tbox Exp $
-$ORIGIN mix1.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3
- )
- NS ns
-ns A 10.53.0.1
-a TXT "soa minttl 3"
-b 2 TXT "explicit ttl 2"
-$INCLUDE mix1sub1.db
-c TXT "soa minttl 3"
-$TTL 1
-d TXT "default ttl 1"
-e 4 TXT "explicit ttl 4"
-f TXT "default ttl 1"
-$INCLUDE mix1sub2.db
-h 5 TXT "the include ttl 5"
+; $Id: ttl1.db,v 1.6 2007/06/19 23:47:04 tbox Exp $
+$ORIGIN mix1.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3
+ )
+ NS ns
+ns A 10.53.0.1
+a TXT "soa minttl 3"
+b 2 TXT "explicit ttl 2"
+$INCLUDE mix1sub1.db
+c TXT "soa minttl 3"
+$TTL 1
+d TXT "default ttl 1"
+e 4 TXT "explicit ttl 4"
+f TXT "default ttl 1"
+$INCLUDE mix1sub2.db
+h 5 TXT "the include ttl 5"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1sub1.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1sub1.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1sub1.db Fri May 21 10:49:49 2010
@@ -1,3 +1,3 @@
-a TXT "soa minttl 3"
-$ORIGIN foo
-b TXT "soa minttl 3"
+a TXT "soa minttl 3"
+$ORIGIN foo
+b TXT "soa minttl 3"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1sub2.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1sub2.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix1sub2.db Fri May 21 10:49:49 2010
@@ -1,3 +1,3 @@
-i TXT "default ttl 1"
-$TTL 5
-g TXT "default ttl 5"
+i TXT "default ttl 1"
+$TTL 5
+g TXT "default ttl 5"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2.db Fri May 21 10:49:49 2010
@@ -1,21 +1,21 @@
-$ORIGIN mix2.
-@ 1 IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3
- )
- NS ns
-ns A 10.53.0.1
-a TXT "inherited ttl 1"
-$INCLUDE mix2sub1.txt
-b TXT "explicit ttl 6"
-c 2 TXT "inherited ttl 2"
-m TXT "explicit ttl 6"
-$TTL 3
-d TXT "default ttl 3"
-e 2 TXT "explicit ttl 2"
-n TXT "default ttl 3"
-$INCLUDE mix2sub2.txt
-f TXT "default ttl 5"
+$ORIGIN mix2.
+@ 1 IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3
+ )
+ NS ns
+ns A 10.53.0.1
+a TXT "inherited ttl 1"
+$INCLUDE mix2sub1.txt
+b TXT "explicit ttl 6"
+c 2 TXT "inherited ttl 2"
+m TXT "explicit ttl 6"
+$TTL 3
+d TXT "default ttl 3"
+e 2 TXT "explicit ttl 2"
+n TXT "default ttl 3"
+$INCLUDE mix2sub2.txt
+f TXT "default ttl 5"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2sub1.txt
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2sub1.txt (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2sub1.txt Fri May 21 10:49:49 2010
@@ -1,3 +1,3 @@
-h TXT "inherited ttl 1"
-$TTL 6
-g TXT "inherited ttl 6"
+h TXT "inherited ttl 1"
+$TTL 6
+g TXT "inherited ttl 6"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2sub2.txt
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2sub2.txt (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/mix2sub2.txt Fri May 21 10:49:49 2010
@@ -1,3 +1,3 @@
-f TXT "default ttl 3"
-$TTL 5
-g TXT "default ttl 5"
+f TXT "default ttl 3"
+$TTL 5
+g TXT "default ttl 5"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/tests.sh
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/tests.sh (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/tests.sh Fri May 21 10:49:49 2010
@@ -1,42 +1,42 @@
-#!/bin/sh
-status=0
-echo "Loadzone include. from include.db file"
-b10-loadzone include.db >> /dev/null
-
-echo "loadzone ttl1. from ttl1.db file"
-b10-loadzone ttl1.db >> /dev/null
-
-echo "loadzone ttl2. from ttl2.db file"
-b10-loadzone ttl2.db >> /dev/null
-
-echo "loadzone mix1. from mix1.db"
-b10-loadzone mix1.db >> /dev/null
-
-echo "loadzone mix2. from mix2.db"
-b10-loadzone mix2.db >> /dev/null
-
-echo "loadzone ttlext. from ttlext.db"
-b10-loadzone ttlext.db >> /dev/null
-
-echo "I:test master file \$INCLUDE semantics"
-dig +nostats +nocmd include. axfr @127.0.0.1 -p 5300 >dig.out
-
-echo "I:test master file BIND 8 compatibility TTL and \$TTL semantics"
-dig +nostats +nocmd ttl1. axfr @127.0.0.1 -p 5300 >>dig.out
-
-echo "I:test master file RFC1035 TTL and \$TTL semantics"
-dig +nostats +nocmd ttl2. axfr @127.0.0.1 -p 5300 >>dig.out
-
-echo "I:test master file BIND8 compatibility and mixed \$INCLUDE with \$TTL semantics"
-dig +nostats +nocmd mix1. axfr @127.0.0.1 -p 5300 >> dig.out
-
-echo "I:test master file RFC1035 TTL and mixed \$INCLUDE with \$TTL semantics"
-dig +nostats +nocmd mix2. axfr @127.0.0.1 -p 5300 >> dig.out
-
-echo "I:test master file BIND9 extenstion of TTL"
-dig +nostats +nocmd ttlext. axfr @127.0.0.1 -p 5300 >> dig.out
-
-diff dig.out known.dig.out || status=1
-
-echo "I:exit status: $status"
-exit $status
+#!/bin/sh
+status=0
+echo "Loadzone include. from include.db file"
+b10-loadzone include.db >> /dev/null
+
+echo "loadzone ttl1. from ttl1.db file"
+b10-loadzone ttl1.db >> /dev/null
+
+echo "loadzone ttl2. from ttl2.db file"
+b10-loadzone ttl2.db >> /dev/null
+
+echo "loadzone mix1. from mix1.db"
+b10-loadzone mix1.db >> /dev/null
+
+echo "loadzone mix2. from mix2.db"
+b10-loadzone mix2.db >> /dev/null
+
+echo "loadzone ttlext. from ttlext.db"
+b10-loadzone ttlext.db >> /dev/null
+
+echo "I:test master file \$INCLUDE semantics"
+dig +nostats +nocmd include. axfr @127.0.0.1 -p 5300 >dig.out
+
+echo "I:test master file BIND 8 compatibility TTL and \$TTL semantics"
+dig +nostats +nocmd ttl1. axfr @127.0.0.1 -p 5300 >>dig.out
+
+echo "I:test master file RFC1035 TTL and \$TTL semantics"
+dig +nostats +nocmd ttl2. axfr @127.0.0.1 -p 5300 >>dig.out
+
+echo "I:test master file BIND8 compatibility and mixed \$INCLUDE with \$TTL semantics"
+dig +nostats +nocmd mix1. axfr @127.0.0.1 -p 5300 >> dig.out
+
+echo "I:test master file RFC1035 TTL and mixed \$INCLUDE with \$TTL semantics"
+dig +nostats +nocmd mix2. axfr @127.0.0.1 -p 5300 >> dig.out
+
+echo "I:test master file BIND9 extenstion of TTL"
+dig +nostats +nocmd ttlext. axfr @127.0.0.1 -p 5300 >> dig.out
+
+diff dig.out known.dig.out || status=1
+
+echo "I:exit status: $status"
+exit $status
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl1.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl1.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl1.db Fri May 21 10:49:49 2010
@@ -1,17 +1,17 @@
-$ORIGIN ttl1.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 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"
-$TTL 1
-d TXT "default ttl 1"
-e 4 TXT "explicit ttl 4"
-f TXT "default ttl 1"
+$ORIGIN ttl1.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 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"
+$TTL 1
+d TXT "default ttl 1"
+e 4 TXT "explicit ttl 4"
+f TXT "default ttl 1"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl2.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl2.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttl2.db Fri May 21 10:49:49 2010
@@ -1,17 +1,17 @@
-$ORIGIN ttl2.
-@ 1 IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 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"
-$TTL 3
-d TXT "default ttl 3"
-e 2 TXT "explicit ttl 2"
-f TXT "default ttl 3"
+$ORIGIN ttl2.
+@ 1 IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 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"
+$TTL 3
+d TXT "default ttl 3"
+e 2 TXT "explicit ttl 2"
+f TXT "default ttl 3"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttlext.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttlext.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/ttlext.db Fri May 21 10:49:49 2010
@@ -1,18 +1,18 @@
-; $Id: ttl1.db,v 1.6 2007/06/19 23:47:04 tbox Exp $
-$ORIGIN ttlext.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3
- )
- NS ns
-ns A 10.53.0.1
-a TXT "soa minttl 3"
-b 2S TXT "explicit ttl 2"
-c TXT "soa minttl 3"
-$TTL 10M ; bind9 extention ttl
-d TXT "default ttl 600"
-e 4 TXT "explicit ttl 4"
-f TXT "default ttl 600"
+; $Id: ttl1.db,v 1.6 2007/06/19 23:47:04 tbox Exp $
+$ORIGIN ttlext.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3
+ )
+ NS ns
+ns A 10.53.0.1
+a TXT "soa minttl 3"
+b 2S TXT "explicit ttl 2"
+c TXT "soa minttl 3"
+$TTL 10M ; bind9 extention ttl
+d TXT "default ttl 600"
+e 4 TXT "explicit ttl 4"
+f TXT "default ttl 600"
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/error.known
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/error.known (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/error.known Fri May 21 10:49:49 2010
@@ -1,11 +1,11 @@
-Error reading zone file: Cannot parse RR, No $ORIGIN: @ IN SOA ns hostmaster 1 3600 1800 1814400 3600
-Error reading zone file: $ORIGIN is not absolute in record:$ORIGIN com
-Error reading zone file: Cannot parse RR: $TL 300
-Error reading zone file: Cannot parse RR: $OIGIN com.
-Error loading database: Error while loading com.: Cannot parse RR: $INLUDE file.txt
-Error loading database: Error while loading com.: Invalid $include formal
-Error loading database: Error while loading com.: Cannot parse RR, No $ORIGIN: $INCLUDE include.txt sub
-Error reading zone file: Invalid TTL: ""
-Error reading zone file: Invalid TTL: "M"
-Error loading database: Error while loading com.: Cannot parse RR: b "no type error!"
-Error reading zone file: [Errno 2] No such file or directory: 'bogusfile'
+Error reading zone file: Cannot parse RR, No $ORIGIN: @ IN SOA ns hostmaster 1 3600 1800 1814400 3600
+Error reading zone file: $ORIGIN is not absolute in record:$ORIGIN com
+Error reading zone file: Cannot parse RR: $TL 300
+Error reading zone file: Cannot parse RR: $OIGIN com.
+Error loading database: Error while loading com.: Cannot parse RR: $INLUDE file.txt
+Error loading database: Error while loading com.: Invalid $include formal
+Error loading database: Error while loading com.: Cannot parse RR, No $ORIGIN: $INCLUDE include.txt sub
+Error reading zone file: Invalid TTL: ""
+Error reading zone file: Invalid TTL: "M"
+Error loading database: Error while loading com.: Cannot parse RR: b "no type error!"
+Error reading zone file: [Errno 2] No such file or directory: 'bogusfile'
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/error.out
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/error.out (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/error.out Fri May 21 10:49:49 2010
@@ -1,11 +1,11 @@
-Error reading zone file: Cannot parse RR, No $ORIGIN: @ IN SOA ns hostmaster 1 3600 1800 1814400 3600
-Error reading zone file: $ORIGIN is not absolute in record:$ORIGIN com
-Error reading zone file: Cannot parse RR: $TL 300
-Error reading zone file: Cannot parse RR: $OIGIN com.
-Error loading database: Error while loading com.: Cannot parse RR: $INLUDE file.txt
-Error loading database: Error while loading com.: Invalid $include formal
-Error loading database: Error while loading com.: Cannot parse RR, No $ORIGIN: $INCLUDE include.txt sub
-Error reading zone file: Invalid TTL: ""
-Error reading zone file: Invalid TTL: "M"
-Error loading database: Error while loading com.: Cannot parse RR: b "no type error!"
-Error reading zone file: [Errno 2] No such file or directory: 'bogusfile'
+Error reading zone file: Cannot parse RR, No $ORIGIN: @ IN SOA ns hostmaster 1 3600 1800 1814400 3600
+Error reading zone file: $ORIGIN is not absolute in record:$ORIGIN com
+Error reading zone file: Cannot parse RR: $TL 300
+Error reading zone file: Cannot parse RR: $OIGIN com.
+Error loading database: Error while loading com.: Cannot parse RR: $INLUDE file.txt
+Error loading database: Error while loading com.: Invalid $include formal
+Error loading database: Error while loading com.: Cannot parse RR, No $ORIGIN: $INCLUDE include.txt sub
+Error reading zone file: Invalid TTL: ""
+Error reading zone file: Invalid TTL: "M"
+Error loading database: Error while loading com.: Cannot parse RR: b "no type error!"
+Error reading zone file: [Errno 2] No such file or directory: 'bogusfile'
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/error.sh
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/error.sh (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/error.sh Fri May 21 10:49:49 2010
@@ -1,37 +1,37 @@
-#!/bin/sh
-status=0
-
-echo "Test no \$ORIGIN error in zone file"
-b10-loadzone originerr1.db 1> /dev/null 2> error.out
-b10-loadzone originerr2.db 1> /dev/null 2>> error.out
-
-echo "Test: key word TTL spell error"
-b10-loadzone keyerror1.db 1> /dev/null 2>> error.out
-
-echo "Test: key word ORIGIN spell error"
-b10-loadzone keyerror2.db 1> /dev/null 2>> error.out
-
-echo "Test: key INCLUDE spell error"
-b10-loadzone keyerror3.db 1> /dev/null 2>> error.out
-
-echo "Test: include formal error, miss filename"
-b10-loadzone formerr1.db 1> /dev/null 2>>error.out
-
-echo "Test: include form error, domain is not absolute"
-b10-loadzone formerr2.db 1> /dev/null 2>> error.out
-
-echo "Test: TTL form error, no ttl value"
-b10-loadzone formerr3.db 1> /dev/null 2>> error.out
-
-echo "Test: TTL form error, ttl value error"
-b10-loadzone formerr4.db 1> /dev/null 2>> error.out
-
-echo "Test: rr form error, no type"
-b10-loadzone formerr5.db 1> /dev/null 2>> error.out
-
-echo "Test: zone file is bogus"
-b10-loadzone bogusfile 1> /dev/null 2>> error.out
-
-diff error.out error.known || status=1
-echo "I:exit status:$status"
-exit $status
+#!/bin/sh
+status=0
+
+echo "Test no \$ORIGIN error in zone file"
+b10-loadzone originerr1.db 1> /dev/null 2> error.out
+b10-loadzone originerr2.db 1> /dev/null 2>> error.out
+
+echo "Test: key word TTL spell error"
+b10-loadzone keyerror1.db 1> /dev/null 2>> error.out
+
+echo "Test: key word ORIGIN spell error"
+b10-loadzone keyerror2.db 1> /dev/null 2>> error.out
+
+echo "Test: key INCLUDE spell error"
+b10-loadzone keyerror3.db 1> /dev/null 2>> error.out
+
+echo "Test: include formal error, miss filename"
+b10-loadzone formerr1.db 1> /dev/null 2>>error.out
+
+echo "Test: include form error, domain is not absolute"
+b10-loadzone formerr2.db 1> /dev/null 2>> error.out
+
+echo "Test: TTL form error, no ttl value"
+b10-loadzone formerr3.db 1> /dev/null 2>> error.out
+
+echo "Test: TTL form error, ttl value error"
+b10-loadzone formerr4.db 1> /dev/null 2>> error.out
+
+echo "Test: rr form error, no type"
+b10-loadzone formerr5.db 1> /dev/null 2>> error.out
+
+echo "Test: zone file is bogus"
+b10-loadzone bogusfile 1> /dev/null 2>> error.out
+
+diff error.out error.known || status=1
+echo "I:exit status:$status"
+exit $status
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr1.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr1.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr1.db Fri May 21 10:49:49 2010
@@ -1,13 +1,13 @@
-$TTL 300
-$ORIGIN com.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-$INCLUDE
-a A 10.0.0.1
+$TTL 300
+$ORIGIN com.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+$INCLUDE
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr2.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr2.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr2.db Fri May 21 10:49:49 2010
@@ -1,12 +1,12 @@
-$TTL 300
-com. IN SOA ns.com. hostmaster.com. (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns.example.com.
-ns.com. A 127.0.0.1
-$INCLUDE include.txt sub
-a.com. A 10.0.0.1
+$TTL 300
+com. IN SOA ns.com. hostmaster.com. (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns.example.com.
+ns.com. A 127.0.0.1
+$INCLUDE include.txt sub
+a.com. A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr3.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr3.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr3.db Fri May 21 10:49:49 2010
@@ -1,12 +1,12 @@
-$TTL
-$ORIGIN com.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-a A 10.0.0.1
+$TTL
+$ORIGIN com.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr4.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr4.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr4.db Fri May 21 10:49:49 2010
@@ -1,12 +1,12 @@
-$TTL M
-$ORIGIN com.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-a A 10.0.0.1
+$TTL M
+$ORIGIN com.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr5.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr5.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/formerr5.db Fri May 21 10:49:49 2010
@@ -1,13 +1,13 @@
-$TTL 2M
-$ORIGIN com.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1 ; ip value
-b "no type error!"
-a A 10.0.0.1
+$TTL 2M
+$ORIGIN com.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1 ; ip value
+b "no type error!"
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/include.txt
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/include.txt (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/include.txt Fri May 21 10:49:49 2010
@@ -1,1 +1,1 @@
-a 300 A 127.0.0.1
+a 300 A 127.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror1.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror1.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror1.db Fri May 21 10:49:49 2010
@@ -1,12 +1,12 @@
-$TL 300
- at ORIGIN com.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-a A 10.0.0.1
+$TL 300
+ at ORIGIN com.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror2.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror2.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror2.db Fri May 21 10:49:49 2010
@@ -1,12 +1,12 @@
-$TTL 300
-$OIGIN com.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-a A 10.0.0.1
+$TTL 300
+$OIGIN com.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror3.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror3.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/keyerror3.db Fri May 21 10:49:49 2010
@@ -1,13 +1,13 @@
-$TTL 300
-$ORIGIN com.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-$INLUDE file.txt
-a A 10.0.0.1
+$TTL 300
+$ORIGIN com.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+$INLUDE file.txt
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/nofilenane.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/nofilenane.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/nofilenane.db Fri May 21 10:49:49 2010
@@ -1,13 +1,13 @@
-$TTL 300
-$ORIGIN com.
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-$INCLUDE
-a A 10.0.0.1
+$TTL 300
+$ORIGIN com.
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+$INCLUDE
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/originerr1.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/originerr1.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/originerr1.db Fri May 21 10:49:49 2010
@@ -1,11 +1,11 @@
-$TTL 300
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-a A 10.0.0.1
+$TTL 300
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+a A 10.0.0.1
Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/originerr2.db
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/originerr2.db (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/originerr2.db Fri May 21 10:49:49 2010
@@ -1,12 +1,12 @@
-$TTL 300
-$ORIGIN com
-@ IN SOA ns hostmaster (
- 1 ; serial
- 3600
- 1800
- 1814400
- 3600
- )
- NS ns
-ns A 127.0.0.1
-a A 10.0.0.1
+$TTL 300
+$ORIGIN com
+@ IN SOA ns hostmaster (
+ 1 ; serial
+ 3600
+ 1800
+ 1814400
+ 3600
+ )
+ NS ns
+ns A 127.0.0.1
+a A 10.0.0.1
More information about the bind10-changes
mailing list