From be8713a1e8d490d8d41eb6245a663e29a39167ef Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Thu, 26 Jul 2018 14:38:19 -0700
Subject: [PATCH] CHANGES, release note, copyrights

---
 CHANGES           | 7 +++++++
 doc/arm/notes.xml | 9 +++++++++
 util/copyrights   | 5 ++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e022f605ab..d58c1882a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+5037.	[func]		"allow-recursion-on" and "allow-query-cache-on"
+			each now default to the other if only one of them
+			is set, in order to be more consistent with the way
+			"allow-recursion" and "allow-query-cache" work.
+			Also we now ensure that both query-cache ACLs are
+			checked when determining cache access. [GL #319]
+
 5036.	[cleanup]	Fixed a spacing/formatting error in some RPZ-related
 			error messages in the log. [GL !805]
 
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index a9f702a9ed..15d3a56609 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -473,6 +473,15 @@
 	  option. [GL #105]
 	</para>
       </listitem>
+      <listitem>
+	<para>
+	  <command>allow-recursion-on</command> and
+	  <command>allow-query-cache-on</command> each now default to
+	  the other if only one of them is set, in order to be consistent
+	  with the way <command>allow-recursion</command> and
+	  <command>allow-query-cache</command> work. [GL #319]
+	</para>
+      </listitem>
     </itemizedlist>
   </section>
 
diff --git a/util/copyrights b/util/copyrights
index 489c688e9e..8b942e52a7 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -443,7 +443,10 @@
 ./bin/tests/system/allow-query/ns2/named56.conf.in	CONF-C	2010,2016,2018
 ./bin/tests/system/allow-query/ns2/named57.conf.in	CONF-C	2013,2016,2018
 ./bin/tests/system/allow-query/ns3/named.args	X	2018
-./bin/tests/system/allow-query/ns3/named.conf.in	CONF-C	2018
+./bin/tests/system/allow-query/ns3/named1.conf.in	CONF-C	2018
+./bin/tests/system/allow-query/ns3/named2.conf.in	CONF-C	2018
+./bin/tests/system/allow-query/ns3/named3.conf.in	CONF-C	2018
+./bin/tests/system/allow-query/ns3/named4.conf.in	CONF-C	2018
 ./bin/tests/system/allow-query/setup.sh		SH	2010,2012,2016,2018
 ./bin/tests/system/allow-query/tests.sh		SH	2010,2012,2013,2016,2018
 ./bin/tests/system/ans.pl			PERL	2011,2012,2014,2016,2017,2018