- Implement RFC8375: Special-Use Domain 'home.arpa.'.

diff --git a/doc/Changelog b/doc/Changelog
index 192517ceb0a074323912ce7f6ba92b814f6c704f..6349795c9b9a428569d51c9965b54e4bec38cda4 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+27 September 2021: Wouter
+       - Implement RFC8375: Special-Use Domain 'home.arpa.'.
+
 21 September 2021: Wouter
        - For crosscompile on windows, detect 64bit stackprotector library.
        - Fix crosscompile shell syntax.

diff --git a/doc/example.conf.in b/doc/example.conf.in
index ff5c7ca8e3f5c6309603e059cd82b2987ad32fa6..949a0706e83cdab7417ee4c9207c14b943d1d9b2 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -666,6 +666,7 @@ server:
        # local-zone: "localhost." nodefault
        # local-zone: "127.in-addr.arpa." nodefault
        # local-zone: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa." nodefault
+       # local-zone: "home.arpa." nodefault
        # local-zone: "onion." nodefault
        # local-zone: "test." nodefault
        # local-zone: "invalid." nodefault

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index f8521ed57950b85ead83a30a7e29a438b57043d4..05971544bdacc3696502529d428d40af32fedfd3 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1412,13 +1412,13 @@ has no other effect than turning off default contents for the
 given zone.  Use \fInodefault\fR if you use exactly that zone, if you want to
 use a subzone, use \fItransparent\fR.
 .P
-The default zones are localhost, reverse 127.0.0.1 and ::1, the onion, test,
-invalid and the AS112 zones. The AS112 zones are reverse DNS zones for
-private use and reserved IP addresses for which the servers on the internet
-cannot provide correct answers. They are configured by default to give
-nxdomain (no reverse information) answers. The defaults can be turned off
-by specifying your own local\-zone of that name, or using the 'nodefault'
-type. Below is a list of the default zone contents.
+The default zones are localhost, reverse 127.0.0.1 and ::1, the home.arpa,
+the onion, test, invalid and the AS112 zones. The AS112 zones are reverse
+DNS zones for private use and reserved IP addresses for which the servers
+on the internet cannot provide correct answers. They are configured by
+default to give nxdomain (no reverse information) answers. The defaults
+can be turned off by specifying your own local\-zone of that name, or
+using the 'nodefault' type. Below is a list of the default zone contents.
 .TP 10
 \h'5'\fIlocalhost\fR
 The IP4 and IP6 localhost information is given. NS and SOA records are provided
@@ -1459,6 +1459,15 @@ local\-data: "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.
     PTR localhost."
 .fi
 .TP 10
+\h'5'\fIhome.arpa (RFC 8375)\fR
+Default content:
+.nf
+local\-zone: "home.arpa." static
+local\-data: "home.arpa. 10800 IN NS localhost."
+local\-data: "home.arpa. 10800 IN
+    SOA localhost. nobody.invalid. 1 3600 1200 604800 10800"
+.fi
+.TP 10
 \h'5'\fIonion (RFC 7686)\fR
 Default content:
 .nf

diff --git a/services/localzone.c b/services/localzone.c
index 075f1087ee6775d5598076087ba5df8bd19d4908..17dd46813839b32b2252756a26f6d01db784f887 100644 (file)
--- a/services/localzone.c
+++ b/services/localzone.c
@@ -898,6 +898,11 @@ int local_zone_enter_defaults(struct local_zones* zones, struct config_file* cfg
                }
                lock_rw_unlock(&z->lock);
        }
+       /* home.arpa. zone (RFC 8375) */
+       if(!add_empty_default(zones, cfg, "home.arpa.")) {
+               log_err("out of memory adding default zone");
+               return 0;
+       }
        /* onion. zone (RFC 7686) */
        if(!add_empty_default(zones, cfg, "onion.")) {
                log_err("out of memory adding default zone");