From e0039478e1592b925da321c1cacf8130b181f850 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Thu, 14 Jan 2016 14:54:21 +0000 Subject: [PATCH] make auth-zone wildcard test actually test an auth-zone --- regression-tests.recursor/auth-zones/command | 2 +- regression-tests.recursor/auth-zones/description | 2 ++ regression-tests.recursor/auth-zones/expected_result | 4 ++-- regression-tests.recursor/config.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/regression-tests.recursor/auth-zones/command b/regression-tests.recursor/auth-zones/command index 008afd506..3fee7965a 100755 --- a/regression-tests.recursor/auth-zones/command +++ b/regression-tests.recursor/auth-zones/command @@ -2,4 +2,4 @@ cleandig host1.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9] cleandig host1.auth-zone.example.net. AAAA | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/' cleandig host2.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/' cleandig host3.auth-zone.example.net. A | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/' -cleandig you-are.wild.example.net. TXT | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/' +cleandig you-are.wild.auth-zone.example.net. TXT | sed 's/\(.*\tIN\t[A-Z0-9]\+\t\)\([0-9]\+\)/\13600/' diff --git a/regression-tests.recursor/auth-zones/description b/regression-tests.recursor/auth-zones/description index 52478b24d..0c6c273e1 100644 --- a/regression-tests.recursor/auth-zones/description +++ b/regression-tests.recursor/auth-zones/description @@ -1,3 +1,5 @@ Test 3 direct queries for data in an auth-zone. 2 records that are in-zone, one that is a CNAME to a name inside another auth-zone and a final one that is a CNAME to a record in a zone where the recursor is not authoritative for. + +Additionally, test auth-zone wildcards. diff --git a/regression-tests.recursor/auth-zones/expected_result b/regression-tests.recursor/auth-zones/expected_result index fb42f2e3b..7ffc4a62b 100644 --- a/regression-tests.recursor/auth-zones/expected_result +++ b/regression-tests.recursor/auth-zones/expected_result @@ -12,6 +12,6 @@ Reply to question for qname='host2.auth-zone.example.net.', qtype=A 0 host3.auth-zone.example.net. IN CNAME 3600 host1.not-auth-zone.example.net. Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0 Reply to question for qname='host3.auth-zone.example.net.', qtype=A -0 you-are.wild.example.net. IN TXT 3600 "Hi there!" +0 you-are.wild.auth-zone.example.net. IN TXT 3600 "Hi there!" Rcode: 0 (No Error), RD: 1, QR: 1, TC: 0, AA: 0, opcode: 0 -Reply to question for qname='you-are.wild.example.net.', qtype=TXT +Reply to question for qname='you-are.wild.auth-zone.example.net.', qtype=TXT diff --git a/regression-tests.recursor/config.sh b/regression-tests.recursor/config.sh index 23e0f3880..556aed47f 100755 --- a/regression-tests.recursor/config.sh +++ b/regression-tests.recursor/config.sh @@ -90,7 +90,6 @@ box.answer-cname-in-local.example.net. 3600 IN NS ns.answer-cname-in-local.examp ns.answer-cname-in-local.example.net. 3600 IN A $PREFIX.22 not-auth-zone.example.net. 3600 IN NS ns.not-auth-zone.example.net. ns.not-auth-zone.example.net. 3600 IN A $PREFIX.23 -*.wild.example.net. 3600 IN TXT "Hi there!" EOF mkdir $PREFIX.11 @@ -397,6 +396,7 @@ host1.auth-zone.example.net. 20 IN AAAA 2001:DB8::1:45BA host2.auth-zone.example.net. 20 IN CNAME host1.another-auth-zone.example.net. host3.auth-zone.example.net. 20 IN CNAME host1.not-auth-zone.example.net. +*.wild.auth-zone.example.net. 3600 IN TXT "Hi there!" EOF cat > recursor-service/another-auth-zone.example.net.zone <