From 575728dee873eed22af886ea13979c7b6aeba1dc Mon Sep 17 00:00:00 2001
From: Tom Krizek <tkrizek@isc.org>
Date: Thu, 18 Jan 2024 16:47:08 +0100
Subject: [PATCH] Remove extraneous dnsrps-secondary.conf from rpz tests

The contents of the dnsrps-secondary.conf file are identical to the
contents of dnsrps.conf. Remove it since it's redundant.
---
 bin/tests/system/rpz/ns5/named.conf.in               | 2 +-
 bin/tests/system/rpz/ns6/named.conf.in               | 2 +-
 bin/tests/system/rpz/ns7/named.conf.in               | 2 +-
 bin/tests/system/rpzrecurse/.gitignore               | 1 -
 bin/tests/system/rpzrecurse/ns2/named.conf.header.in | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bin/tests/system/rpz/ns5/named.conf.in b/bin/tests/system/rpz/ns5/named.conf.in
index e1f8fb6056..58b591b70d 100644
--- a/bin/tests/system/rpz/ns5/named.conf.in
+++ b/bin/tests/system/rpz/ns5/named.conf.in
@@ -35,7 +35,7 @@ options {
 	# turn rpz on or off
 	include "rpz-switch";
 
-	include "../dnsrps-secondary.conf";
+	include "../dnsrps.conf";
 };
 
 key rndc_key {
diff --git a/bin/tests/system/rpz/ns6/named.conf.in b/bin/tests/system/rpz/ns6/named.conf.in
index c0ad5c4237..66832eed48 100644
--- a/bin/tests/system/rpz/ns6/named.conf.in
+++ b/bin/tests/system/rpz/ns6/named.conf.in
@@ -36,7 +36,7 @@ options {
 	nsip-enable yes
 	nsdname-enable yes;
 
-	include "../dnsrps-secondary.conf";
+	include "../dnsrps.conf";
 };
 
 logging { category rpz { default_debug; }; };
diff --git a/bin/tests/system/rpz/ns7/named.conf.in b/bin/tests/system/rpz/ns7/named.conf.in
index 7effd3db41..3f5265751a 100644
--- a/bin/tests/system/rpz/ns7/named.conf.in
+++ b/bin/tests/system/rpz/ns7/named.conf.in
@@ -32,7 +32,7 @@ options {
 	nsdname-enable yes
 	min-update-interval 0;
 
-	include "../dnsrps-secondary.conf";
+	include "../dnsrps.conf";
 };
 
 logging { category rpz { default_debug; }; };
diff --git a/bin/tests/system/rpzrecurse/.gitignore b/bin/tests/system/rpzrecurse/.gitignore
index 5d4371d852..b58ca75d82 100644
--- a/bin/tests/system/rpzrecurse/.gitignore
+++ b/bin/tests/system/rpzrecurse/.gitignore
@@ -5,7 +5,6 @@
 /ns3/named2.conf
 /ns4/named.conf
 /ans5/ans.pid
-/dnsrps-secondary.conf
 /dnsrps.conf
 /dnsrpzd.conf
 session.key
diff --git a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
index 2fb16788aa..90a17b7a37 100644
--- a/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
+++ b/bin/tests/system/rpzrecurse/ns2/named.conf.header.in
@@ -27,7 +27,7 @@ options {
 	querylog yes;
 
 	# let ns3 start dnsrpzd
-	include "../dnsrps-secondary.conf";
+	include "../dnsrps.conf";
 };
 
 key rndc_key {