From 763c67c878a581d79e19e506a1bc0b00e06d9493 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Wed, 20 Jan 2016 17:40:40 -0800
Subject: [PATCH] [v9_10] add regression test for RT #41518

4297.	[test]		Ensure delegations in RPZ zones fail robustly.
			[RT #41518]
---
 CHANGES                          | 3 +++
 bin/tests/system/rpz/ns3/base.db | 6 ++----
 bin/tests/system/rpz/tests.sh    | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1c45c80cea..3f7cad7161 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4297.	[test]		Ensure delegations in RPZ zones fail robustly.
+			[RT #41518]
+
 4295.	[bug]		An unchecked result in dns_message_pseudosectiontotext()
 			could allow incorrect text formatting of EDNS EXPIRE
 			options. [RT #41437]
diff --git a/bin/tests/system/rpz/ns3/base.db b/bin/tests/system/rpz/ns3/base.db
index 5b0d261b05..9fbf1fab0c 100644
--- a/bin/tests/system/rpz/ns3/base.db
+++ b/bin/tests/system/rpz/ns3/base.db
@@ -12,10 +12,6 @@
 ; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 ; PERFORMANCE OF THIS SOFTWARE.
 
-; $Id$
-
-
-
 ; RPZ test
 ;   This basic file is copied to several zone files before being used.
 ;   Its contents are also changed with nsupdate
@@ -25,3 +21,5 @@ $TTL	300
 @	SOA	blx.  hostmaster.ns.blx. ( 1 3600 1200 604800 60 )
 	NS	ns.tld3.
 
+; regression testing for some old crashes
+example.com     NS	example.org.
diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh
index 77a94c5fdc..3d05067d62 100644
--- a/bin/tests/system/rpz/tests.sh
+++ b/bin/tests/system/rpz/tests.sh
@@ -642,5 +642,9 @@ $RNDCCMD $ns7 reload policy2
 $DIG z.x.servfail -p 5300 @$ns7 > dig.out.ns7
 grep NXDOMAIN dig.out.ns7 > /dev/null || setret I:failed;
 
+echo "I:checking rpz with delegation fails correctly"
+$DIG -p 5300 @$ns3 ns example.com > dig.out.delegation
+grep "status: SERVFAIL" dig.out.delegation > /dev/null || setret "I:failed"
+
 echo "I:exit status: $status"
 exit $status