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

RFC 9462 adds RESOLVER.ARPA to the list of built in empty zones.

(cherry picked from commit 49561277ded03bb63f769822f0c185b2dad75463)
---
 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 bfe6df36c8..42a0915110 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -395,6 +395,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 9355d4c8d9..e414e03548 100644
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -435,7 +435,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: 201 (198 automatic)" rndc.out.1.test$n >/dev/null || ret=1
+grep "number of zones: 203 (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 92e92afb10..3dab21be42 100644
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -4909,6 +4909,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