From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 14 Jan 2021 14:31:17 +0000 (+0100)
Subject: - fix that testdata/rpz_qname.rpl trigger tests succeed.
X-Git-Tag: release-1.14.0rc1~62^2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e00d516fe9d0f5da94866657232d5497bebfa82;p=thirdparty%2Funbound.git

- fix that testdata/rpz_qname.rpl trigger tests succeed.
---

diff --git a/testdata/rpz_qname.rpl b/testdata/rpz_qname.rpl
index 4f17f8577..dd47f188a 100644
--- a/testdata/rpz_qname.rpl
+++ b/testdata/rpz_qname.rpl
@@ -47,12 +47,15 @@ stub-zone:
 stub-zone:
 	name: "example."
 	stub-addr: 10.20.30.50
+stub-zone:
+	name: "tcp."
+	stub-addr: 10.20.30.60
 CONFIG_END
 
 SCENARIO_BEGIN Test all support RPZ action for QNAME trigger
 
 ; a.
-RANGE_BEGIN 0 100
+RANGE_BEGIN 0 1000
 	ADDRESS 10.20.30.40
 ENTRY_BEGIN
 MATCH opcode qtype qname
@@ -89,7 +92,7 @@ ENTRY_END
 RANGE_END
 
 ; example.
-RANGE_BEGIN 0 100
+RANGE_BEGIN 0 1000
 	ADDRESS 10.20.30.50
 ENTRY_BEGIN
 MATCH opcode qtype qname
@@ -125,6 +128,32 @@ ENTRY_END
 
 RANGE_END
 
+; tcp.
+RANGE_BEGIN 0 1000
+	ADDRESS 10.20.30.60
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+tcp. IN NS
+SECTION ANSWER
+tcp. IN NS ns.example.
+SECTION ADDITIONAL
+ns.tcp IN A 10.20.30.60
+ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA NOERROR
+SECTION QUESTION
+tcp. IN TXT
+SECTION ANSWER
+tcp. IN TXT "tcp. answer from upstream ns"
+ENTRY_END
+RANGE_END
+
 STEP 10 QUERY
 ENTRY_BEGIN
 REPLY RD
@@ -306,6 +335,7 @@ ENTRY_END
 
 STEP 95 QUERY
 ENTRY_BEGIN
+REPLY RD
 SECTION QUESTION
 tcp. IN TXT
 ENTRY_END
@@ -313,7 +343,7 @@ ENTRY_END
 STEP 96 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all
-REPLY QR RA AA TC NOERROR
+REPLY QR RD RA AA TC NOERROR
 SECTION QUESTION
 tcp. IN TXT
 SECTION ANSWER
@@ -322,6 +352,7 @@ ENTRY_END
 STEP 97 QUERY
 ENTRY_BEGIN
 MATCH TCP
+REPLY RD
 SECTION QUESTION
 tcp.  IN TXT
 ENTRY_END
@@ -329,11 +360,11 @@ ENTRY_END
 STEP 98 CHECK_ANSWER
 ENTRY_BEGIN
 MATCH all TCP
-REPLY QR RD RA AA NOERROR
+REPLY QR RD RA NOERROR
 SECTION QUESTION
 tcp.  IN TXT
 SECTION ANSWER
-tcp.  IN  TXT "local tcp data 2nd zone"
+tcp. IN TXT "tcp. answer from upstream ns"
 ENTRY_END
 
 ; no answer is checked at exit of testbound.