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)

diff --git a/bin/named/server.c b/bin/named/server.c
index 7306e0ab845ac4ec04d28f9e623c3dcc74422a26..098e21d0acab3d3b1915157b1a0d08d5e38e0e3b 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -403,6 +403,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 bf6eef0f138b4a1f60c1337e628b2bcf2b1baf9c..6bfef4c7cdc3fc34e1a2c2d7fe001b4e7ce89caa 100644 (file)
--- a/bin/tests/system/builtin/tests.sh
+++ b/bin/tests/system/builtin/tests.sh
@@ -119,7 +119,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=$(expr $n + 1)
 ret=0
@@ -133,7 +134,7 @@ for zone in ${emptyzones}; do
   count=$(expr $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 9464dbac82e1db26babf7d859f1218c32ab6e6cb..21f5caafc7bf0b8e3d37bab8b9e182889b5d30f2 100644 (file)
--- a/bin/tests/system/rndc/tests.sh
+++ b/bin/tests/system/rndc/tests.sh
@@ -434,7 +434,7 @@ n=$(expr $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=$(expr $status + $ret)
 

diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst
index 34089caa6d6253b6530b993d0efd7b74dd53b278..ecc84d4b378a161d40ffe293869bfc1711cae6cd 100644 (file)
--- a/doc/arm/reference.rst
+++ b/doc/arm/reference.rst
@@ -3879,6 +3879,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