From 49561277ded03bb63f769822f0c185b2dad75463 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 14 Feb 2024 16:32:33 +1100
Subject: [PATCH 1/3] Add RESOLVER.ARPA to the built in empty zones

RFC 9462 adds RESOLVER.ARPA to the list of built in empty zones.
---
 bin/named/server.c                | 3 +++
 bin/tests/system/builtin/tests.sh | 5 +++--
 bin/tests/system/rndc/tests.sh    | 2 +-
 doc/arm/reference.rst             | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/named/server.c b/bin/named/server.c
index 116ccbbd8f..04116bb365 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -400,6 +400,9 @@ const char *empty_zones[] = {
 	/* RFC 8375 */
 	"HOME.ARPA",
 
+	/* RFC 9462 */
+	"RESOLVER.ARPA",
+
 	NULL
 };
 
diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh
index cd3df75c24..96b1a2c8a6 100644
--- a/bin/tests/system/builtin/tests.sh
+++ b/bin/tests/system/builtin/tests.sh
@@ -120,7 +120,8 @@ A.E.F.IP6.ARPA
 B.E.F.IP6.ARPA
 8.B.D.0.1.0.0.2.IP6.ARPA
 EMPTY.AS112.ARPA
-HOME.ARPA"
+HOME.ARPA
+RESOLVER.ARPA"
 
 n=$((n + 1))
 ret=0
@@ -134,7 +135,7 @@ for zone in ${emptyzones}; do
   count=$((count + 1))
 done
 lines=$(grep "automatic empty zone: " ns1/named.run | wc -l)
-test $count -eq $lines -a $count -eq 99 || {
+test $count -eq $lines -a $count -eq 100 || {
   ret=1
   echo_i "failed (count mismatch)"
 }
diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh
index 0c420c0789..ee9bd1c6b5 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -436,7 +436,7 @@ n=$((n + 1))
 echo_i "testing automatic zones are reported ($n)"
 ret=0
 $RNDC -s 10.53.0.4 -p ${EXTRAPORT6} -c ns4/key6.conf status >rndc.out.1.test$n || ret=1
-grep "number of zones: 199 (198 automatic)" rndc.out.1.test$n >/dev/null || ret=1
+grep "number of zones: 201 (200 automatic)" rndc.out.1.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 0f9cc6b543..e4f1b1cc7a 100644
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -4781,6 +4781,7 @@ The current list of empty zones is:
 -  B.E.F.IP6.ARPA
 -  EMPTY.AS112.ARPA
 -  HOME.ARPA
+-  RESOLVER.ARPA
 
 Empty zones can be set at the view level and only apply to views of
 class IN. Disabled empty zones are only inherited from options if there

From d12c23875062852b5830f60e1865f89412fd373f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 14 Feb 2024 16:35:15 +1100
Subject: [PATCH 2/3] Add CHANGES entry for [GL #4580]

---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index e6c25d654d..0a33b68252 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+6364.	[protocol]	Add RESOLVER.ARPA to the built in empty zones.
+			[GL #4580]
+
 6363.	[bug]		dig/mdig +ednsflags=<non-zero-value> did not re-enable
 			EDNS if it had been disabled. [GL #4641]
 

From ecb043fc7b1a99a7e2ffb3d34974d16c00348471 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 14 Feb 2024 16:37:49 +1100
Subject: [PATCH 3/3] Add release note for [GL #4580]

---
 doc/notes/notes-current.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 3ed4747884..baf7840df2 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -20,7 +20,7 @@ Security Fixes
 New Features
 ~~~~~~~~~~~~
 
-- None.
+- Added RESOLVER.ARPA to the built in empty zones. :gl:`#4580`
 
 Removed Features
 ~~~~~~~~~~~~~~~~