Merge branch '4580-add-resolver-arpa-to-the-built-in-empty-zones-bind-9.18' into 'bind-9.18'

[9.18] Resolve "Add resolver.arpa to the built in empty zones"

See merge request isc-projects/bind9!8890

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]
 

bin/named/server.c

@@ -395,6 +395,9 @@ const char *empty_zones[] = {
 	/* RFC 8375 */
 	"HOME.ARPA",
 
+	/* RFC 9462 */
+	"RESOLVER.ARPA",
+
 	NULL
 };
 

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)"
 }

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))
 

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

doc/notes/notes-current.rst

@@ -23,6 +23,8 @@ New Features
 - The statistics channel now includes counters that indicate the number
   of currently connected TCP IPv4/IPv6 clients. :gl:`#4425`
 
+- Added RESOLVER.ARPA to the built in empty zones. :gl:`#4580`
+
 Removed Features
 ~~~~~~~~~~~~~~~~