more last resort lookup options.

git-svn-id: file:///svn/unbound/trunk@2139 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index afab6b419bdd215ec03710bab683266a0499af8d..70881b864a3b8327391b39d9de1bc36cdb38d472 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 3 June 2010: Wouter
        - ldns tarball updated, 1.6.5.
+       - review comments, split dependency cycle tracking for parentside
+         last resort lookups for A and AAAA so there are more lookup options.
 
 2 June 2010: Wouter
        - Fix compile warning if compiled without threads.

diff --git a/iterator/iter_utils.c b/iterator/iter_utils.c
index 1594463df60f7651bc147d79de434f1406fa9a60..7b946b88e3e27c2ac1b2c809bf32c62498c7e5e7 100644 (file)
--- a/iterator/iter_utils.c
+++ b/iterator/iter_utils.c
@@ -480,13 +480,17 @@ iter_mark_pside_cycle_targets(struct module_qstate* qstate, struct delegpt* dp)
                        continue;
                /* see if this ns as target causes dependency cycle */
                if(causes_cycle(qstate, ns->name, ns->namelen, 
-                       LDNS_RR_TYPE_AAAA, qstate->qinfo.qclass) ||
-                  causes_cycle(qstate, ns->name, ns->namelen, 
                        LDNS_RR_TYPE_A, qstate->qinfo.qclass)) {
                        log_nametypeclass(VERB_QUERY, "skipping target due "
                                "to dependency cycle", ns->name,
                                LDNS_RR_TYPE_A, qstate->qinfo.qclass);
                        ns->done_pside4 = 1;
+               }
+               if(causes_cycle(qstate, ns->name, ns->namelen, 
+                       LDNS_RR_TYPE_AAAA, qstate->qinfo.qclass)) {
+                       log_nametypeclass(VERB_QUERY, "skipping target due "
+                               "to dependency cycle", ns->name,
+                               LDNS_RR_TYPE_AAAA, qstate->qinfo.qclass);
                        ns->done_pside6 = 1;
                }
        }

diff --git a/testdata/autotrust_addpend_early.rpl b/testdata/autotrust_addpend_early.rpl
index 0835ec657748070b8b0699bc9355ae53794eeaaa..ea7102584078893829cb4ec2cd5c97d2bff19f5b 100644 (file)
--- a/testdata/autotrust_addpend_early.rpl
+++ b/testdata/autotrust_addpend_early.rpl
@@ -138,6 +138,14 @@ example.com.       10800   IN      RRSIG   DNSKEY 5 2 10800 20091024111500 20090921111500 30899
 example.com.   10800   IN      RRSIG   DNSKEY 5 2 10800 20091024111500 20090921111500 60946 example.com. qBHDZu0XQmr6kpt51r1DxT5tuyfwSHcoL8qLpwwhyyNFF13OPlvxgmCVl+1v27A9+h8tcuqaNls5f+tcFBwtRg== ;{id = 60946}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id

diff --git a/testdata/autotrust_addpend_nosign.rpl b/testdata/autotrust_addpend_nosign.rpl
index 76aaf748f4d2d265b01a3abfb77de5c4c64e8665..84a66187fed5b10a5ca5be8fb3b56cc3b778a161 100644 (file)
--- a/testdata/autotrust_addpend_nosign.rpl
+++ b/testdata/autotrust_addpend_nosign.rpl
@@ -142,6 +142,14 @@ example.com.    10800   IN      RRSIG   DNSKEY 5 2 10800 20091024111500 20090921
 example.com.    10800   IN      RRSIG   DNSKEY 5 2 10800 20091024111500 20090921111500 60946 example.com. o+Cbs7DcYPYlSLd4hi3vkSVQpXGnKgKSi9MpHGfu1Uahv5190U2DUOxP1du/HOYbf+IHYL8zLbMZjVEG5wgnTg== ;{id = 60946}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id

diff --git a/testdata/autotrust_addpend_nosignnew.rpl b/testdata/autotrust_addpend_nosignnew.rpl
index f230fe8abd4eaa42cef025bace908e32f42d2132..ce68695627d38fc2f5a054b52be6e4016c5a6d4a 100644 (file)
--- a/testdata/autotrust_addpend_nosignnew.rpl
+++ b/testdata/autotrust_addpend_nosignnew.rpl
@@ -143,6 +143,14 @@ example.com.       10800   IN      RRSIG   DNSKEY 5 2 10800 20091024111500 20090921111500 30899
 example.com.   10800   IN      RRSIG   DNSKEY 5 2 10800 20091024111500 20090921111500 60946 example.com. rOxbAROwiW21OR8HjINk3IBs9bsxJKjipQ5EU4wWutiF/jr6KNT6LgtZv0TaFSiBHN/Jqz1wB2ODD2HXwLQ4DQ== ;{id = 60946}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id

diff --git a/testdata/autotrust_addpend_once.rpl b/testdata/autotrust_addpend_once.rpl
index 148e04839751a8ab73730d25a89b837f7b393bba..fb11edb591bdedf5a1d13e6042772367e81c917c 100644 (file)
--- a/testdata/autotrust_addpend_once.rpl
+++ b/testdata/autotrust_addpend_once.rpl
@@ -141,6 +141,14 @@ example.com.       10800   IN      RRSIG   DNSKEY 5 2 10800 20091124111500 20091018111500 30899
 example.com.   10800   IN      RRSIG   DNSKEY 5 2 10800 20091124111500 20091018111500 60946 example.com. HgXol1hdvbomOM1CFRW8qsHd3D0qOnN72EeMHTcpxIBBiuNLKZn4n1M14Voxj3vo0eAMNuG/y7EjQkxKvSsaDA== ;{id = 60946}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id

diff --git a/testdata/autotrust_probefailsig.rpl b/testdata/autotrust_probefailsig.rpl
index bb9de3d29421a68429b6eb5b28142436807e8c9b..b376757d93a233675b1d4fbdda35ae4897c3e0c4 100644 (file)
--- a/testdata/autotrust_probefailsig.rpl
+++ b/testdata/autotrust_probefailsig.rpl
@@ -96,7 +96,7 @@ example.com.  10800   IN      RRSIG   DNSKEY 5 2 10800 20090101011500 20090101011500 16614
 ENTRY_END
 
 ENTRY_BEGIN
-MATCH opcode subdomain
+MATCH opcode qtype qname
 ADJUST copy_id copy_query
 REPLY QR
 SECTION QUESTION
@@ -104,7 +104,14 @@ www.example.com. IN A
 SECTION ANSWER
 www.example.com. IN A 10.20.30.40
 ENTRY_END
-RANGE_END
+
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
 
 ENTRY_BEGIN
 MATCH opcode qname qtype

diff --git a/testdata/autotrust_revoked_use.rpl b/testdata/autotrust_revoked_use.rpl
index 0f9b53c749a21b4a2508fa825cc9f05732594a9f..fc2f4022a5866fb0c8a4820268004e27d29e9341 100644 (file)
--- a/testdata/autotrust_revoked_use.rpl
+++ b/testdata/autotrust_revoked_use.rpl
@@ -189,6 +189,14 @@ example.com.       10800   IN      RRSIG   DNSKEY 5 2 10800 20091224111500 20091118111500 55582
 
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id
@@ -220,6 +228,14 @@ example.com.       10800   IN      RRSIG   DNSKEY 5 2 10800 20091224111500 20091118111500 30899
 example.com.   10800   IN      RRSIG   DNSKEY 5 2 10800 20091224111500 20091118111500 55582 example.com. NsC5s2quifzA7yQBnbroWHJ9rHfSrBo0V7+c+kZoii2cViOm8636uqcWlaNTqNtD5UI6vzQ5zXF4P8JGoac6ZQ== ;{id = 55582}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id

diff --git a/testdata/autotrust_revoked_with_invalid.rpl b/testdata/autotrust_revoked_with_invalid.rpl
index 81dbd8e32287692d434abf306ea3dce24d704a53..f92185332cbb2c409bfff98374ce8c44fdffa2ee 100644 (file)
--- a/testdata/autotrust_revoked_with_invalid.rpl
+++ b/testdata/autotrust_revoked_with_invalid.rpl
@@ -86,6 +86,14 @@ example.com. 10800   IN      RRSIG   DNSKEY 5 2 10800 20091124111500 20091018111500 16486
 
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id

diff --git a/testdata/autotrust_valid_use.rpl b/testdata/autotrust_valid_use.rpl
index 5274848aceae77d146c23f9c7d397a1edddb3245..c82cbb1b2c9dd6be5302ceb872c103be4b8453d8 100644 (file)
--- a/testdata/autotrust_valid_use.rpl
+++ b/testdata/autotrust_valid_use.rpl
@@ -156,6 +156,21 @@ example.com.       3600    IN      RRSIG   NS 5 2 3600 20090924111500 20090821111500 30899 examp
 SECTION ADDITIONAL
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA
+SECTION QUESTION
+ns.example.com. IN AAAA
+SECTION ANSWER
+SECTION AUTHORITY
+example.com.   3600    IN      NS      ns.example.com.
+example.com.   3600    IN      RRSIG   NS 5 2 3600 20090924111500 20090821111500 30899 example.com. J5wxRq0jgwQL6yy530kvo9cHqNAUHV8IF4dvaYZL0bNraO2Oe6dVXqlJl4+cxNHI2TMsstwFPr2Zz8tv6Az2mQ== ;{id = 30899}
+SECTION ADDITIONAL
+ns.example.com.        3600    IN      A       1.2.3.4
+ns.example.com.        3600    IN      RRSIG   A 5 3 3600 20090924111500 20090821111500 30899 example.com. JsXbS18oyc0zkVaOWGSFdIQuOsZKflT0GraT9afDPoWLCgH4ApF7jNgfJV7Pqy1sTBRajME5IUAhpANwGBuW4A== ;{id = 30899}
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id

diff --git a/testdata/val_cnametoposnowc.rpl b/testdata/val_cnametoposnowc.rpl
index 99e1f5eed2612fb7c98ba47933a6ec7cab1f9706..bc1a6945667fb004daa5918d7ac773daf21c422a 100644 (file)
--- a/testdata/val_cnametoposnowc.rpl
+++ b/testdata/val_cnametoposnowc.rpl
@@ -160,6 +160,14 @@ REPLY QR AA REFUSED
 SECTION QUESTION
 ns.example.com. IN AAAA
 ENTRY_END
+
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
 RANGE_END
 
 ; ns.example.net.
@@ -215,6 +223,14 @@ SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qname qtype
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.net. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qname qtype
 ADJUST copy_id

diff --git a/testdata/val_dnamewc.rpl b/testdata/val_dnamewc.rpl
index e4c0b5b3b6903b204b2ebdc20dc40b25dc7b3c93..3c02768a0d11ae40847c00331469d990abd68fc4 100644 (file)
--- a/testdata/val_dnamewc.rpl
+++ b/testdata/val_dnamewc.rpl
@@ -115,6 +115,14 @@ SECTION QUESTION
 ns.example.com. IN AAAA
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
@@ -179,6 +187,14 @@ SECTION QUESTION
 ns.example.net. IN AAAA
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.net. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_ds_sha2_downgrade.rpl b/testdata/val_ds_sha2_downgrade.rpl
index 6ca56b6c49eb45c8b8c2c9177b00a0be4c495a17..2418c87fd6a3ca708fee50ac3ec4789c7988dc42 100644 (file)
--- a/testdata/val_ds_sha2_downgrade.rpl
+++ b/testdata/val_ds_sha2_downgrade.rpl
@@ -181,6 +181,14 @@ SECTION AUTHORITY
 SECTION ADDITIONAL
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.sub.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_dsnsec.rpl b/testdata/val_dsnsec.rpl
index b8fe1b023a8c69088ff108a2105d4412996e543f..32702034fdfad0c6af535d169c86ad03f05c37ae 100644 (file)
--- a/testdata/val_dsnsec.rpl
+++ b/testdata/val_dsnsec.rpl
@@ -99,6 +99,19 @@ example.com.    IN NS   ns.example.com.
 example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+ns.example.com. IN A
+SECTION ANSWER
+ns.example.com.         IN      A       1.2.3.4
+ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
+SECTION AUTHORITY
+example.com.    IN NS   ns.example.com.
+example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
+ENTRY_END
 
 ; response to DNSKEY priming query
 ENTRY_BEGIN

diff --git a/testdata/val_nodata_failsig.rpl b/testdata/val_nodata_failsig.rpl
index 88f875d5bbc55a88d7fadf216c1eb09d3f7bb9e7..9cd8289c727aca6fb69b71259d64324325f43c42 100644 (file)
--- a/testdata/val_nodata_failsig.rpl
+++ b/testdata/val_nodata_failsig.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nodata_hasdata.rpl b/testdata/val_nodata_hasdata.rpl
index d8dda5cd527ef860aa0a8cec83c4595b03e57847..f5321182a5edd22bbc03046fe6bd0262eb82d896 100644 (file)
--- a/testdata/val_nodata_hasdata.rpl
+++ b/testdata/val_nodata_hasdata.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nodata_zonecut.rpl b/testdata/val_nodata_zonecut.rpl
index ae4e052ac3f8e9e09c45dbcb5ff7bf941fde5aed..49b52c0fd45b4f89e588a572b0c2831b280686a2 100644 (file)
--- a/testdata/val_nodata_zonecut.rpl
+++ b/testdata/val_nodata_zonecut.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nodatawc_badce.rpl b/testdata/val_nodatawc_badce.rpl
index 5a50e073bb87eb675d43714ea637ca7108c9dbef..dcf8697db0cb58981da6f87d11f3f19e472958fa 100644 (file)
--- a/testdata/val_nodatawc_badce.rpl
+++ b/testdata/val_nodatawc_badce.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nodatawc_nodeny.rpl b/testdata/val_nodatawc_nodeny.rpl
index a388545a0dfc78b76de6e99230562b8583dac5ab..52dcb0f7842fe19249eb48b2b4685a723ab29fa0 100644 (file)
--- a/testdata/val_nodatawc_nodeny.rpl
+++ b/testdata/val_nodatawc_nodeny.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nokeyprime.rpl b/testdata/val_nokeyprime.rpl
index f193605dc129e7bf35aa84e12f25eeb7dbc334df..c30396af9381087d3a9c773fd9baf2b04b75527a 100644 (file)
--- a/testdata/val_nokeyprime.rpl
+++ b/testdata/val_nokeyprime.rpl
@@ -85,6 +85,20 @@ ns.example.com.         IN      A       1.2.3.4
 ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+ns.example.com. IN A
+SECTION ANSWER
+ns.example.com.         IN      A       1.2.3.4
+ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
+SECTION AUTHORITY
+example.com.    IN NS   ns.example.com.
+example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
+ENTRY_END
+
 ; barely valid nodata for AAAA
 ENTRY_BEGIN
 MATCH opcode qtype qname

diff --git a/testdata/val_nsec3_b1_nameerror_noce.rpl b/testdata/val_nsec3_b1_nameerror_noce.rpl
index 21061b6088f1f65311509a5390527154ca188cc7..6dca24cc50ece46dce414f727e8e8a380837b858 100644 (file)
--- a/testdata/val_nsec3_b1_nameerror_noce.rpl
+++ b/testdata/val_nsec3_b1_nameerror_noce.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b1_nameerror_nonc.rpl b/testdata/val_nsec3_b1_nameerror_nonc.rpl
index d7943fbe1044bd874cccbe0270a5e97d949c498c..b9d32d32e0de0c3ee91bf39a74f6c4e32f74d56a 100644 (file)
--- a/testdata/val_nsec3_b1_nameerror_nonc.rpl
+++ b/testdata/val_nsec3_b1_nameerror_nonc.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b1_nameerror_nowc.rpl b/testdata/val_nsec3_b1_nameerror_nowc.rpl
index 21c33eda81a0922794196f24112cde982da38919..925db1df3af157b641cc95c84e72103fdd4db0c0 100644 (file)
--- a/testdata/val_nsec3_b1_nameerror_nowc.rpl
+++ b/testdata/val_nsec3_b1_nameerror_nowc.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b21_nodataent_wr.rpl b/testdata/val_nsec3_b21_nodataent_wr.rpl
index cc62842aa9d9c395417846703c3cbd1e52073d62..6c2f44ef57488600df3a924e86b37f0ce1b5720e 100644 (file)
--- a/testdata/val_nsec3_b21_nodataent_wr.rpl
+++ b/testdata/val_nsec3_b21_nodataent_wr.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b2_nodata_nons.rpl b/testdata/val_nsec3_b2_nodata_nons.rpl
index 5ff2b91c1af825c6f540e29f3d5d8e9a7cf80b25..11f1579259ec1ddf2dfb9f0661e4ad1ca3750e53 100644 (file)
--- a/testdata/val_nsec3_b2_nodata_nons.rpl
+++ b/testdata/val_nsec3_b2_nodata_nons.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b3_optout_noce.rpl b/testdata/val_nsec3_b3_optout_noce.rpl
index c16ba2e8b4d1aa8c764686593f808c8d1befd78d..e61aba83e24969f26dfa212ec7f2893743e8e4ba 100644 (file)
--- a/testdata/val_nsec3_b3_optout_noce.rpl
+++ b/testdata/val_nsec3_b3_optout_noce.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b3_optout_nonc.rpl b/testdata/val_nsec3_b3_optout_nonc.rpl
index 5ef749f25eda95a217a5ed84d49fa8f619035ab8..7c8f19fd5b9ef4dd3401a7823f62036accb5b9a1 100644 (file)
--- a/testdata/val_nsec3_b3_optout_nonc.rpl
+++ b/testdata/val_nsec3_b3_optout_nonc.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b4_wild_wr.rpl b/testdata/val_nsec3_b4_wild_wr.rpl
index 547aade904f8309c47bb2b5dddeb017f4b24dcdf..bff6b4457530eee5f8bdf18ca03581e6ca13ec68 100644 (file)
--- a/testdata/val_nsec3_b4_wild_wr.rpl
+++ b/testdata/val_nsec3_b4_wild_wr.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b5_wcnodata_noce.rpl b/testdata/val_nsec3_b5_wcnodata_noce.rpl
index 26a161f213dbee241591b66e425d35bd885b349a..a933b50c94f74c2fa32581e55a48273e3854da88 100644 (file)
--- a/testdata/val_nsec3_b5_wcnodata_noce.rpl
+++ b/testdata/val_nsec3_b5_wcnodata_noce.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b5_wcnodata_nonc.rpl b/testdata/val_nsec3_b5_wcnodata_nonc.rpl
index 0aec8fa31fe169fdd8579a1ca8f22ce4b7828255..8ff0e76bc860d956eefc77c53f2cd95ffa603314 100644 (file)
--- a/testdata/val_nsec3_b5_wcnodata_nonc.rpl
+++ b/testdata/val_nsec3_b5_wcnodata_nonc.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_b5_wcnodata_nowc.rpl b/testdata/val_nsec3_b5_wcnodata_nowc.rpl
index 51192f95f0e464e017f33862a4217c1719e404ea..4460e5faee22221073cde50bd74718db56f0aef8 100644 (file)
--- a/testdata/val_nsec3_b5_wcnodata_nowc.rpl
+++ b/testdata/val_nsec3_b5_wcnodata_nowc.rpl
@@ -46,6 +46,15 @@ RANGE_END
 ; ns1.example.
 RANGE_BEGIN 0 100
        ADDRESS 192.0.2.1
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id copy_query
+REPLY QR REFUSED
+SECTION QUESTION
+ns1.example. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id copy_query

diff --git a/testdata/val_nsec3_nodatawccname.rpl b/testdata/val_nsec3_nodatawccname.rpl
index 61f33e69fc79d58caf3ed7b795e12836e516f527..4f01cdf8a41af1412b6ecaa2be237b7c5bb66a00 100644 (file)
--- a/testdata/val_nsec3_nodatawccname.rpl
+++ b/testdata/val_nsec3_nodatawccname.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nsec3_nods_badopt.rpl b/testdata/val_nsec3_nods_badopt.rpl
index 6ff56cb72686bc272a14fac46b31a24e9f033b86..c2f71ca76ac7640ea108767a12828ae6fca1d2d9 100644 (file)
--- a/testdata/val_nsec3_nods_badopt.rpl
+++ b/testdata/val_nsec3_nods_badopt.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nsec3_nods_badsig.rpl b/testdata/val_nsec3_nods_badsig.rpl
index 8f02cd77f6516c290c7e3cf9a7b2a0ff08115979..8e5a0cf451ad49668491c26fc896a3c36ca37e72 100644 (file)
--- a/testdata/val_nsec3_nods_badsig.rpl
+++ b/testdata/val_nsec3_nods_badsig.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nsec3_nods_soa.rpl b/testdata/val_nsec3_nods_soa.rpl
index eebcefd15320c4bb23eb21100e9f0925e21ac1ee..a967c5037e3091a89eee988c9136b3c65cd53f2c 100644 (file)
--- a/testdata/val_nsec3_nods_soa.rpl
+++ b/testdata/val_nsec3_nods_soa.rpl
@@ -72,6 +72,15 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA SERVFAIL
+SECTION QUESTION
+ns.example.com. IN A
+SECTION ANSWER
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id
@@ -169,6 +178,14 @@ RANGE_END
 ; ns.sub.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.10
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.sub.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nsec3_wcany_nodeny.rpl b/testdata/val_nsec3_wcany_nodeny.rpl
index f13c5e2083a9524e63eba5a41884e62967236c6a..9215ccc04a4ddbe4822086028d8cbf2945813225 100644 (file)
--- a/testdata/val_nsec3_wcany_nodeny.rpl
+++ b/testdata/val_nsec3_wcany_nodeny.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nx_nodeny.rpl b/testdata/val_nx_nodeny.rpl
index a055495eef2097a658bfe7a360508074cc754362..9c1e0bb3d7661c590970b5cf4deee74bc008a04f 100644 (file)
--- a/testdata/val_nx_nodeny.rpl
+++ b/testdata/val_nx_nodeny.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nx_nowc.rpl b/testdata/val_nx_nowc.rpl
index 4335976691ee0a13972ae233d3e13e4ec67a0340..9b8880d77b6671e49f7bd688f9546a3eb7b22c6a 100644 (file)
--- a/testdata/val_nx_nowc.rpl
+++ b/testdata/val_nx_nowc.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_nx_overreach.rpl b/testdata/val_nx_overreach.rpl
index 17852776a07a7544631aa9d7e48cd31e354fcd15..0e958f514900ee54fdbbc70127e7ec57ecffb645 100644 (file)
--- a/testdata/val_nx_overreach.rpl
+++ b/testdata/val_nx_overreach.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_positive_nosigs.rpl b/testdata/val_positive_nosigs.rpl
index 8bee939cecb5f026a5fcfc0c2815284cd2b1081f..4ab6e54f0d036b054c15a6c567e94156f93b0614 100644 (file)
--- a/testdata/val_positive_nosigs.rpl
+++ b/testdata/val_positive_nosigs.rpl
@@ -85,6 +85,20 @@ ns.example.com.         IN      A       1.2.3.4
 ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+ns.example.com. IN A
+SECTION ANSWER
+ns.example.com.         IN      A       1.2.3.4
+ns.example.com. 3600    IN      RRSIG   A 3 3 3600 20070926135752 20070829135752 2854 example.com. MC0CFQCMSWxVehgOQLoYclB9PIAbNP229AIUeH0vNNGJhjnZiqgIOKvs1EhzqAo= ;{id = 2854}
+SECTION AUTHORITY
+example.com.    IN NS   ns.example.com.
+example.com.    3600    IN      RRSIG   NS 3 2 3600 20070926134150 20070829134150 2854 example.com. MC0CFQCN+qHdJxoI/2tNKwsb08pra/G7aAIUAWA5sDdJTbrXA1/3OaesGBAO3sI= ;{id = 2854}
+ENTRY_END
+
 ; barely valid nodata for AAAA
 ENTRY_BEGIN
 MATCH opcode qtype qname

diff --git a/testdata/val_positive_wc_nodeny.rpl b/testdata/val_positive_wc_nodeny.rpl
index 515e6d9ed38b82247166fd9dd5379909edf555ef..b0c1a54285011caa90a6986ef412189bb60ff48d 100644 (file)
--- a/testdata/val_positive_wc_nodeny.rpl
+++ b/testdata/val_positive_wc_nodeny.rpl
@@ -71,6 +71,14 @@ RANGE_END
 ; ns.example.com.
 RANGE_BEGIN 0 100
        ADDRESS 1.2.3.4
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR AA REFUSED
+SECTION QUESTION
+ns.example.com. IN A
+ENTRY_END
+
 ENTRY_BEGIN
 MATCH opcode qtype qname
 ADJUST copy_id

diff --git a/testdata/val_secds_nosig.rpl b/testdata/val_secds_nosig.rpl
index cb6833cc1686bf0e9e7711d2295ded3a96470478..5aeb47f93a525c9493db5da923b16c82c4c659e6 100644 (file)
--- a/testdata/val_secds_nosig.rpl
+++ b/testdata/val_secds_nosig.rpl
@@ -166,6 +166,16 @@ ns.sub.example.com. IN A 1.2.3.6
 ;ns.sub.example.com.     3600    IN      RRSIG   A 5 4 3600 20070926134150 20070829134150 30899 sub.example.com. UF7shD/gt1FOp2UHgLTNbPzVykklSXFMEtJ1xD+Hholwf/PIzd7zoaIttIYibNa4fUXCqMg22H9P7MRhfmFe6g== ;{id = 30899}
 ENTRY_END
 
+ENTRY_BEGIN
+MATCH opcode qtype qname
+ADJUST copy_id
+REPLY QR NOERROR
+SECTION QUESTION
+ns.sub.example.com. IN A
+SECTION ANSWER
+ns.sub.example.com. IN A 1.2.3.6
+;ns.sub.example.com.     3600    IN      RRSIG   A 5 4 3600 20070926134150 20070829134150 30899 sub.example.com. UF7shD/gt1FOp2UHgLTNbPzVykklSXFMEtJ1xD+Hholwf/PIzd7zoaIttIYibNa4fUXCqMg22H9P7MRhfmFe6g== ;{id = 30899}
+ENTRY_END
 
 ; response to DNSKEY priming query
 ; sub.example.com.        3600    IN      DS      30899 RSASHA1 1 f7ed618f24d5e5202927e1d27bc2e84a141cb4b3