harmonize example zone

1 files changed, 43 insertions, 91 deletions

diff --git a/tests/example b/tests/example
index 378f23e..cef1732 100644
--- a/tests/example
+++ b/tests/example
@@ -13,44 +13,30 @@
 ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-; $Id: example,v 1.13 2004/03/19 00:06:37 halley Exp $
+; $Id: example 265924 2016-05-20 18:26:42Z bwelling $
 
 $ORIGIN .
 $TTL 300	; 5 minutes
-example		IN SOA	ns1.example. hostmaster.example. (
-				1	   ; serial
-				2000       ; refresh (2000 seconds)
-				2000       ; retry (2000 seconds)
-				1814400    ; expire (3 weeks)
-				3600       ; minimum (1 hour)
-				)
+example		IN SOA	ns1.example. hostmaster.example. 1 2 3 4 5 
 example.		NS	ns1.example.
 ns1.example.	A	10.53.0.1
 example.		NS	ns2.example.
 ns2.example.	A	10.53.0.2
 
 $ORIGIN example.
+@			NSEC3PARAM	1 1 12 aabbccdd
+@			NSEC3PARAM	1 1 12 -
 *			MX	10 mail
 a			TXT	"foo foo foo"
 			PTR	foo.net.
-;; The next line not starting with ';;' is leading whitespace followed by
-;; EOL.  We want to treat that as if EOL had appeared alone.
-   	    
-;; The next line not starting with ';;' is leading whitespace followed by
-;; a comment followed by EOL.  We want to treat that as if EOL had appeared
-;; alone.
-		; foo	
 $TTL 3600	; 1 hour
 a01			A	0.0.0.0
 a02			A	255.255.255.255
 ;;
-;; XXXRTH dnspython doesn't currently implement A6, and since
-;; A6 records are effectively dead, it may never do so.
-;;
-;;a601			A6	0 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
-;;			A6	64 ::ffff:ffff:ffff:ffff foo.
-;;			A6	127 ::1 foo.
-;;			A6	128  .
+;a601			A6	0 ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+;			A6	64 ::ffff:ffff:ffff:ffff foo.
+;			A6	127 ::1 foo.
+;			A6	128  .
 aaaa01			AAAA	ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
 aaaa02			AAAA	::1
 afsdb01			AFSDB	0 hostname
@@ -59,22 +45,16 @@ $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= )
+cert01			CERT	65534 65535 PRIVATEOID MxFcby9k/yvedMfQgKzhH5er0Mu/vILz45IkskceFGgi WCn/GxHhai6VAuHAoNUz4YoU1tVfSCSqQYn6//11U6Nl d80jEeC8aTrO+KKmCaY= 
 cname01			CNAME	cname-target.
 cname02			CNAME	cname-target
 cname03			CNAME	.
+dhcid01			DHCID	AAIBY2/AuCccgoJbsaxcQc9TUapptP69lOjxfNuVAA2kjEA=
+dhcid02			DHCID	AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQdWL3b/NaiUDlW2No=
+dhcid03			DHCID	AAABxLmlskllE0MVjd57zHcWmEH3pCQ6VytcKD//7es/deY=
 $TTL 300	; 5 minutes
 d			A	73.80.65.49
 $TTL 3600	; 1 hour
-dhcid01			DHCID	( AAIBY2/AuCccgoJbsaxcQc9TUapptP69l
-			          OjxfNuVAA2kjEA= )
-dhcid02			DHCID   ( AAEBOSD+XR3Os/0LozeXVqcNc7FwCfQdW
-                        	  L3b/NaiUDlW2No= )
-dhcid03			DHCID	( AAABxLmlskllE0MVjd57zHcWmEH3pCQ6V
-                                  ytcKD//7es/deY= )
 dname01			DNAME	dname-target.
 dname02			DNAME	dname-target
 dname03			DNAME	.
@@ -101,26 +81,18 @@ isdn01			ISDN	"isdn-address"
 isdn02			ISDN	"isdn-address" "subaddress"
 isdn03			ISDN	"isdn-address"
 isdn04			ISDN	"isdn-address" "subaddress"
-;; dnspython no longer supports old DNSSEC
-;;key01			KEY	512 255 1 (
-;;				AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aR
-;;				yzWZriO6i2odGWWQVucZqKVsENW91IOW4vqudngPZsY3
-;;				GvQ/xVA8/7pyFj6b7Esga60zyGW6LFe9r8n6paHrlG5o
-;;				jqf0BaqHT+8= )
-;;key02			KEY	HOST|FLAG4 DNSSEC RSAMD5 (
-;;				AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aR
-;;				yzWZriO6i2odGWWQVucZqKVsENW91IOW4vqudngPZsY3
-;;				GvQ/xVA8/7pyFj6b7Esga60zyGW6LFe9r8n6paHrlG5o
-;;				jqf0BaqHT+8= )
+;key01			KEY	512 255 1 AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aR yzWZriO6i2odGWWQVucZqKVsENW91IOW4vqudngPZsY3 GvQ/xVA8/7pyFj6b7Esga60zyGW6LFe9r8n6paHrlG5o jqf0BaqHT+8= 
+;key02			KEY	HOST|FLAG4 DNSSEC RSAMD5 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
 loc03			LOC	60 9 0.000 N 24 39 0.000 E 10.00m 90000000.00m 2000m 20m
-loc04			LOC	60 9 1.5 N 24 39 0.000 E 10.00m 20m 2000m 20m
-loc05			LOC	60 9 1.51 N 24 39 0.000 E 10.00m 20m 2000m 20m
-loc06			LOC	0 9 1.51 N 0 39 0.000 E 10.00m 20m 2000m 20m
-loc07			LOC	0 9 1.51 S 0 39 0.000 W 10.00m 20m 2000m 20m
+loc04			LOC	60 9 1.5 N 24 39 0.000 E 10.00m 90000000.00m 2000m 20m
+loc05			LOC	60 9 1.51 N 24 39 0.000 E 10.00m 90000000.00m 2000m 20m
+loc06			LOC	60 9 1 N 24 39 0.000 E 10.00m 90000000.00m 2000m 20m
+loc07			LOC	0 9 1 N 24 39 0.000 E 10.00m 90000000.00m 2000m 20m
+loc08			LOC	0 9 1 S 24 39 0.000 E 10.00m 90000000.00m 2000m 20m
 ;;
 ;; XXXRTH  These are all obsolete and unused.  dnspython doesn't implement
 ;; them
@@ -140,10 +112,10 @@ nsap-ptr01		NSAP-PTR foo.
 			NSAP-PTR .
 nsap01			NSAP	0x47000580005a0000000001e133ffffff00016100
 nsap02			NSAP	0x47.000580005a0000000001e133ffffff000161.00
-;;nxt01			NXT	a.secure ( NS SOA MX SIG KEY LOC NXT )
-;;nxt02			NXT	. ( NSAP-PTR NXT )
-;;nxt03			NXT	. ( A )
-;;nxt04			NXT	. ( 127 )
+;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.
 px01			PX	65535 foo. bar.
 px02			PX	65535 . .
@@ -157,19 +129,15 @@ $ORIGIN s.example.
 ns			A	73.80.65.49
 $ORIGIN example.
 $TTL 3600	; 1 hour
-;;sig01			SIG	NXT 1 3 3600 (
-;;				20200101000000 20030101000000 2143 foo
-;;				MxFcby9k/yvedMfQgKzhH5er0Mu/vILz45IkskceFGgi
-;;				WCn/GxHhai6VAuHAoNUz4YoU1tVfSCSqQYn6//11U6Nl
-;;				d80jEeC8aTrO+KKmCaY= )
+;sig01			SIG	NXT 1 3 3600 20200101000000 20030101000000 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
-tlsa1			TLSA	3 1 1 a9cdf989b504fe5dca90c0d2167b6550570734f7c763e09fdf88904e06157065
-tlsa2			TLSA	1 0 1 efddf0d915c7bdc5782c0881e1b2a95ad099fbdd06d7b1f77982d9364338d955
-tlsa3			TLSA	1 0 2 81ee7f6c0ecc6b09b7785a9418f54432de630dd54dc6ee9e3c49de547708d236d4c413c3e97e44f969e635958aa410495844127c04883503e5b024cf7a8f6a94
+tlsa1			TLSA    3 1 1 a9cdf989b504fe5dca90c0d2167b6550570734f7c763e09fdf88904e06157065
+tlsa2			TLSA    1 0 1 efddf0d915c7bdc5782c0881e1b2a95ad099fbdd06d7b1f77982d9364338d955
+tlsa3			TLSA    1 0 2 81ee7f6c0ecc6b09b7785a9418f54432de630dd54dc6ee9e3c49de547708d236d4c413c3e97e44f969e635958aa410495844127c04883503e5b024cf7a8f6a94
 txt01			TXT	"foo"
 txt02			TXT	"foo" "bar"
 txt03			TXT	"foo"
@@ -194,36 +162,19 @@ 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"
-dlv01			DLV	12345 3 1 123456789abcdef67890123456789abcdef67890
 ds01			DS	12345 3 1 123456789abcdef67890123456789abcdef67890
-cds01			CDS	12345 3 1 123456789abcdef67890123456789abcdef67890
 apl01			APL	1:192.168.32.0/21 !1:192.168.38.0/28
 apl02			APL	1:224.0.0.0/4 2:FF00:0:0:0:0:0:0:0/8
 unknown2		TYPE999	\# 8 0a0000010a000001
-rrsig01			RRSIG	NSEC 1 3 3600 20200101000000 20030101000000 2143 foo MxFcby9k/yvedMfQgKzhH5er0Mu/ vILz45IkskceFGgiWCn/GxHhai6V AuHAoNUz4YoU1tVfSCSqQYn6//11 U6Nld80jEeC8aTrO+KKmCaY=
-nsec01			NSEC	a.secure. A MX RRSIG NSEC TYPE1234
-nsec02			NSEC	. NSAP-PTR NSEC
-nsec03			NSEC 	. NSEC TYPE65535
-dnskey01		DNSKEY	512 255 1 (
-				AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aR
-				yzWZriO6i2odGWWQVucZqKVsENW91IOW4vqudngPZsY3
-				GvQ/xVA8/7pyFj6b7Esga60zyGW6LFe9r8n6paHrlG5o
-				jqf0BaqHT+8= )
-dnskey02		DNSKEY	257 3 RSAMD5 (
-				AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aR
-				yzWZriO6i2odGWWQVucZqKVsENW91IOW4vqudngPZsY3
-				GvQ/xVA8/7pyFj6b7Esga60zyGW6LFe9r8n6paHrlG5o
-				jqf0BaqHT+8= )
-cdnskey01		CDNSKEY	256 3 8 (
-				AwEAAbmiLgh411Pz3v3XCSBrvYf52A/Gv55ItN1NbOLH
-				Cqt3Ec3p+VB/kQ87VjjMrycanZFnZT4l9uCFuYh21Ccy
-				xVpcxExbM0UuhX5rJoDyeFSXoQlkHrB01osPl5Vri5Ym
-				KtcmqGxZ9An0VSunohkyiX1SrNRZSdQnk9/pIHDe/c8D
-				)
-;
-; test known type using unknown RR syntax
-;
-unknown3		A	\# 4 7f000002
+unknown3		A       \# 4 7f000002
+rrsig01			RRSIG	NSEC 1 3 3600 20200101000000 20030101000000 2143 foo MxFcby9k/yvedMfQgKzhH5er0Mu/vILz45IkskceFGgi WCn/GxHhai6VAuHAoNUz4YoU1tVfSCSqQYn6//11U6Nl d80jEeC8aTrO+KKmCaY= 
+nsec01			NSEC	a.secure A MX RRSIG NSEC TYPE1234
+nsec02			NSEC	. ( NSAP-PTR NSEC )
+nsec03			NSEC	. ( NSEC TYPE65535 )
+nsec301			NSEC3 1 1 12 aabbccdd 2t7b4g4vsa5smi47k61mv5bv1a22bojr MX DNSKEY NS SOA NSEC3PARAM RRSIG
+nsec302			NSEC3 1 1 12 - 2t7b4g4vsa5smi47k61mv5bv1a22bojr MX DNSKEY NS SOA NSEC3PARAM RRSIG
+dnskey01		DNSKEY	512 255 1 AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aR yzWZriO6i2odGWWQVucZqKVsENW91IOW4vqudngPZsY3 GvQ/xVA8/7pyFj6b7Esga60zyGW6LFe9r8n6paHrlG5o jqf0BaqHT+8= 
+dnskey02		DNSKEY	257 3 RSAMD5 ( AQMFD5raczCJHViKtLYhWGz8hMY9UGRuniJDBzC7w0aR yzWZriO6i2odGWWQVucZqKVsENW91IOW4vqudngPZsY3 GvQ/xVA8/7pyFj6b7Esga60zyGW6LFe9r8n6paHrlG5o jqf0BaqHT+8= )
 sshfp1			SSHFP	1 1 aa549bfe898489c02d1715d97d79c57ba2fa76ab
 spf			SPF	"v=spf1 mx -all"
 ipseckey01		IPSECKEY 10 1 2 192.0.2.38 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
@@ -231,15 +182,16 @@ ipseckey02		IPSECKEY 10 0 2 . AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
 ipseckey03		IPSECKEY 10 3 2 mygateway.example.com. AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
 ipseckey04		IPSECKEY 10 2 2 2001:0DB8:0:8002::2000:1 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
 ipseckey05		IPSECKEY 10 3 2 mygateway2 AQNRU3mG7TVTO2BkR47usntb102uFJtugbo6BSGvgqt4AQ==
-nsec301			NSEC3 1 1 12 aabbccdd 2t7b4g4vsa5smi47k61mv5bv1a22bojr MX DNSKEY NS SOA NSEC3PARAM RRSIG
-nsec302			NSEC3 1 1 12 - 2t7b4g4vsa5smi47k61mv5bv1a22bojr MX DNSKEY NS SOA NSEC3PARAM RRSIG
-nsec3param01		NSEC3PARAM 1 1 12 aabbccdd
-nsec3param02		NSEC3PARAM 1 1 12 -
-hip01			HIP 2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D rvs1.example.com. rvs2
+hip01			HIP 2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
+hip02			HIP 2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D rvs.example.com.
+hip03			HIP 2 200100107B1A74DF365639CC39F1D578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D rvs1.example.com.  rvs2.example.com.
+cds01			CDS	12345 3 1 123456789abcdef67890123456789abcdef67890
+cdnskey01		CDNSKEY	256 3 8 ( AwEAAbmiLgh411Pz3v3XCSBrvYf52A/Gv55ItN1NbOLH Cqt3Ec3p+VB/kQ87VjjMrycanZFnZT4l9uCFuYh21Ccy xVpcxExbM0UuhX5rJoDyeFSXoQlkHrB01osPl5Vri5Ym KtcmqGxZ9An0VSunohkyiX1SrNRZSdQnk9/pIHDe/c8D )
+uri01			URI 10 1 "ftp://ftp1.example.com/public"
+uri02			URI 10 1 "http://www.example.com/path"
 caa01			CAA 0 issue "ca.example.net"
 caa02			CAA 0 iodef "mailto:security@example.com"
 caa03			CAA 0 iodef "http://iodef.example.com/"
 caa04			CAA 0 issue "ca.example.net; account=230123"
 caa05			CAA 0 issue "ca.example.net; policy=ev"
 caa06			CAA 128 tbs "Unknown"
-uri0q			URI 10 1 "http://www.example.com/"