From: Bert Hubert Date: Sat, 1 Mar 2008 22:09:27 +0000 (+0000) Subject: add a new regression test 'cname-and-wildcard-at-root', which requires a new testzone... X-Git-Tag: rec-3.1.7.1~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c52117d0dbcdcda051b9b856d31d96653519c32f;p=thirdparty%2Fpdns.git add a new regression test 'cname-and-wildcard-at-root', which requires a new testzone. Fix up 'external-cname-pointer' test to deal with our 'new' rootreferrals git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1146 d19b8d6e-7fed-0310-83ef-9ca221ded41b --- diff --git a/regression-tests/cname-and-wildcard-at-root/command b/regression-tests/cname-and-wildcard-at-root/command new file mode 100755 index 0000000000..868513e305 --- /dev/null +++ b/regression-tests/cname-and-wildcard-at-root/command @@ -0,0 +1,3 @@ +#!/bin/sh + +cleandig secure.wtest.com A diff --git a/regression-tests/cname-and-wildcard-at-root/description b/regression-tests/cname-and-wildcard-at-root/description new file mode 100644 index 0000000000..1c3c3bf7c6 --- /dev/null +++ b/regression-tests/cname-and-wildcard-at-root/description @@ -0,0 +1,3 @@ +If a CNAME wildcard is present, but there is also a direct hit for the qname +but not for the qtype, a NODATA response should ensue. This test runs at the +root of the domain (the 'apex') diff --git a/regression-tests/cname-and-wildcard-at-root/expected_result b/regression-tests/cname-and-wildcard-at-root/expected_result new file mode 100644 index 0000000000..ee993ef4e7 --- /dev/null +++ b/regression-tests/cname-and-wildcard-at-root/expected_result @@ -0,0 +1,3 @@ +1 wtest.com. IN SOA 3600 ns1.wtest.com. ahu.example.com. 2005092501 28800 7200 604800 86400 +Rcode: 0, RD: 0, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='secure.wtest.com.', qtype=A diff --git a/regression-tests/external-cname-pointer/expected_result b/regression-tests/external-cname-pointer/expected_result index 7258b9dba1..5be467fd30 100644 --- a/regression-tests/external-cname-pointer/expected_result +++ b/regression-tests/external-cname-pointer/expected_result @@ -1,3 +1,29 @@ 0 external.example.com. IN CNAME 120 somewhere.else.net. +1 . IN NS 518400 a.root-servers.net. +1 . IN NS 518400 b.root-servers.net. +1 . IN NS 518400 c.root-servers.net. +1 . IN NS 518400 d.root-servers.net. +1 . IN NS 518400 e.root-servers.net. +1 . IN NS 518400 f.root-servers.net. +1 . IN NS 518400 g.root-servers.net. +1 . IN NS 518400 h.root-servers.net. +1 . IN NS 518400 i.root-servers.net. +1 . IN NS 518400 j.root-servers.net. +1 . IN NS 518400 k.root-servers.net. +1 . IN NS 518400 l.root-servers.net. +1 . IN NS 518400 m.root-servers.net. +2 a.root-servers.net. IN A 3600000 198.41.0.4 +2 b.root-servers.net. IN A 3600000 192.228.79.201 +2 c.root-servers.net. IN A 3600000 192.33.4.12 +2 d.root-servers.net. IN A 3600000 128.8.10.90 +2 e.root-servers.net. IN A 3600000 192.203.230.10 +2 f.root-servers.net. IN A 3600000 192.5.5.241 +2 g.root-servers.net. IN A 3600000 192.112.36.4 +2 h.root-servers.net. IN A 3600000 128.63.2.53 +2 i.root-servers.net. IN A 3600000 192.36.148.17 +2 j.root-servers.net. IN A 3600000 192.58.128.30 +2 k.root-servers.net. IN A 3600000 193.0.14.129 +2 l.root-servers.net. IN A 3600000 198.32.64.12 +2 m.root-servers.net. IN A 3600000 202.12.27.33 Rcode: 0, RD: 0, TC: 0, AA: 1, opcode: 0 Reply to question for qname='external.example.com.', qtype=A diff --git a/regression-tests/named.conf b/regression-tests/named.conf index acde8fde25..b1253efe71 100644 --- a/regression-tests/named.conf +++ b/regression-tests/named.conf @@ -17,3 +17,8 @@ zone "test.com"{ file "./test.com"; }; +zone "wtest.com"{ + type master; + file "./wtest.com"; +}; + diff --git a/regression-tests/wtest.com b/regression-tests/wtest.com new file mode 100644 index 0000000000..68b7917736 --- /dev/null +++ b/regression-tests/wtest.com @@ -0,0 +1,16 @@ +$TTL 3600 +$ORIGIN wtest.com. +@ IN SOA ns1.wtest.com. ahu.example.com. ( 2005092501 + 8H ; refresh + 2H ; retry + 1W ; expire + 1D ; default_ttl + ) + +@ IN NS ns1 +@ IN NS ns2 +@ IN MX 10 smtp-servers.example.com. +@ IN MX 15 smtp-servers +* IN CNAME server1 +secure IN MX 10 server1 +server1 IN A 1.2.3.4