From: Wouter Wijngaards Date: Thu, 25 Oct 2018 09:01:53 +0000 (+0000) Subject: - Fix #4132: Openness/closeness of RANGE intervals in rpl files. X-Git-Tag: release-1.8.2rc1~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2a10046043a0391ed5afa3aca0d6b50be09903;p=thirdparty%2Funbound.git - Fix #4132: Openness/closeness of RANGE intervals in rpl files. git-svn-id: file:///svn/unbound/trunk@4953 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index 8e424e335..ce0e21831 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -7,6 +7,7 @@ deny-any: yes in unbound.conf. This responds with an empty message to queries of type ANY. - Fix #4141: More randomness to rrset-roundrobin. + - Fix #4132: Openness/closeness of RANGE intervals in rpl files. 24 October 2018: Ralph - Add markdel function to ECS slabhash. diff --git a/testdata/black_ds_entry.rpl b/testdata/black_ds_entry.rpl index 8b4fa9bd7..e2367a980 100644 --- a/testdata/black_ds_entry.rpl +++ b/testdata/black_ds_entry.rpl @@ -19,7 +19,7 @@ SCENARIO_BEGIN Test validator with blacked key entry for DS and further queries ; until the key entry expires. ; K.ROOT-SERVERS.NET. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 193.0.14.129 ENTRY_BEGIN MATCH opcode qtype qname @@ -47,7 +47,7 @@ ENTRY_END RANGE_END ; a.gtld-servers.net. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 192.5.6.30 ENTRY_BEGIN MATCH opcode qtype qname @@ -116,7 +116,7 @@ ENTRY_END RANGE_END ; ns.example.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.3.4 ENTRY_BEGIN MATCH opcode qtype qname @@ -228,7 +228,7 @@ ENTRY_END RANGE_END ; ns.blabla.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.3.5 ENTRY_BEGIN MATCH opcode qtype qname @@ -336,7 +336,7 @@ ENTRY_END RANGE_END ; ns.sub.example.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.4.6 ENTRY_BEGIN MATCH opcode qtype qname @@ -402,7 +402,7 @@ ENTRY_END RANGE_END ; ns.foo.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.4.7 ENTRY_BEGIN MATCH opcode qtype qname diff --git a/testdata/black_key_entry.rpl b/testdata/black_key_entry.rpl index 4fb3c719d..37946c008 100644 --- a/testdata/black_key_entry.rpl +++ b/testdata/black_key_entry.rpl @@ -19,7 +19,7 @@ SCENARIO_BEGIN Test validator with blacked key entry and further queries ; until the key entry expires. ; K.ROOT-SERVERS.NET. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 193.0.14.129 ENTRY_BEGIN MATCH opcode qtype qname @@ -47,7 +47,7 @@ ENTRY_END RANGE_END ; a.gtld-servers.net. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 192.5.6.30 ENTRY_BEGIN MATCH opcode qtype qname @@ -116,7 +116,7 @@ ENTRY_END RANGE_END ; ns.example.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.3.4 ENTRY_BEGIN MATCH opcode qtype qname @@ -228,7 +228,7 @@ ENTRY_END RANGE_END ; ns.blabla.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.3.5 ENTRY_BEGIN MATCH opcode qtype qname @@ -336,7 +336,7 @@ ENTRY_END RANGE_END ; ns.sub.example.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.4.6 ENTRY_BEGIN MATCH opcode qtype qname @@ -402,7 +402,7 @@ ENTRY_END RANGE_END ; ns.foo.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.4.7 ENTRY_BEGIN MATCH opcode qtype qname diff --git a/testdata/black_prime_entry.rpl b/testdata/black_prime_entry.rpl index c3f93266f..8221d2db6 100644 --- a/testdata/black_prime_entry.rpl +++ b/testdata/black_prime_entry.rpl @@ -18,7 +18,7 @@ SCENARIO_BEGIN Test validator with blacklist prime gives bad key entry ; comes from an 'expired signatures' name server. ; K.ROOT-SERVERS.NET. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 193.0.14.129 ENTRY_BEGIN MATCH opcode qtype qname @@ -46,7 +46,7 @@ ENTRY_END RANGE_END ; a.gtld-servers.net. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 192.5.6.30 ENTRY_BEGIN MATCH opcode qtype qname @@ -96,7 +96,7 @@ ENTRY_END RANGE_END ; ns.example.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.3.4 ENTRY_BEGIN MATCH opcode qtype qname @@ -177,7 +177,7 @@ ENTRY_END RANGE_END ; ns.blabla.com. -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 1.2.3.5 ENTRY_BEGIN MATCH opcode qtype qname diff --git a/testdata/iter_pcnamech.rpl b/testdata/iter_pcnamech.rpl index 1aba95b07..098ae0bb5 100644 --- a/testdata/iter_pcnamech.rpl +++ b/testdata/iter_pcnamech.rpl @@ -109,8 +109,8 @@ ENTRY_END RANGE_END -; the working version, until time 50. -RANGE_BEGIN 0 50 +; the working version, until time 49. +RANGE_BEGIN 0 49 ADDRESS 1.2.3.44 ENTRY_BEGIN MATCH opcode qtype qname @@ -220,7 +220,7 @@ RANGE_END ; Broken. Does not respond to anything (servfail instead ; of timeouts since this is easier to encode in .rpl file format). -RANGE_BEGIN 0 50 +RANGE_BEGIN 0 49 ADDRESS 1.2.3.55 ENTRY_BEGIN MATCH opcode diff --git a/testdata/iter_pcnamechrec.rpl b/testdata/iter_pcnamechrec.rpl index 90745fcf3..ca996bb38 100644 --- a/testdata/iter_pcnamechrec.rpl +++ b/testdata/iter_pcnamechrec.rpl @@ -110,8 +110,8 @@ ENTRY_END RANGE_END -; the working version, until time 50. -RANGE_BEGIN 0 50 +; the working version, until time 49. +RANGE_BEGIN 0 49 ADDRESS 1.2.3.44 ENTRY_BEGIN MATCH opcode qtype qname @@ -221,7 +221,7 @@ RANGE_END ; Broken. Does not respond to anything (servfail instead ; of timeouts since this is easier to encode in .rpl file format). -RANGE_BEGIN 0 50 +RANGE_BEGIN 0 49 ADDRESS 1.2.3.55 ENTRY_BEGIN MATCH opcode diff --git a/testdata/net_signed_servfail.rpl b/testdata/net_signed_servfail.rpl index 925dceee2..ada445574 100644 --- a/testdata/net_signed_servfail.rpl +++ b/testdata/net_signed_servfail.rpl @@ -19,7 +19,7 @@ SCENARIO_BEGIN Test validator with DS introduction for .net ; after introduction of a .NET DS in the root for a running validator. ; K.ROOT-SERVERS.NET. (before .net DS introduction) -RANGE_BEGIN 0 100 +RANGE_BEGIN 0 99 ADDRESS 193.0.14.129 ENTRY_BEGIN MATCH opcode qtype qname