From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 7 Oct 2024 10:26:11 +0000 (+0200)
Subject: Ensure serve-rfc1918 is enabled when doing serve-rfc6303
X-Git-Tag: rec-5.2.0-alpha1~43^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14693%2Fhead;p=thirdparty%2Fpdns.git

Ensure serve-rfc1918 is enabled when doing serve-rfc6303
---

diff --git a/pdns/recursordist/reczones.cc b/pdns/recursordist/reczones.cc
index c54f537ad3..1fa8361fbf 100644
--- a/pdns/recursordist/reczones.cc
+++ b/pdns/recursordist/reczones.cc
@@ -516,6 +516,9 @@ static void processServeRFC6303(std::shared_ptr<SyncRes::domainmap_t>& newMap, L
   if (!::arg().mustDo("serve-rfc6303")) {
     return;
   }
+  if (!::arg().mustDo("serve-rfc1918")) {
+    return;
+  }
   SLOG(g_log << Logger::Warning << "Inserting rfc 6303 private space zones" << endl,
        log->info(Logr::Notice, "Inserting rfc 6303 private space zones"));
   // Section 4.2
diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/settings/table.py
index ecb2403915..7c2db986a9 100644
--- a/pdns/recursordist/settings/table.py
+++ b/pdns/recursordist/settings/table.py
@@ -2394,6 +2394,7 @@ Individual parts of these zones can still be loaded or forwarded.
         'doc' : '''
 This makes the server authoritatively aware of the zones in RFC 6303 not covered by RFC 1918.
 Individual parts of these zones can still be loaded or forwarded.
+:ref:`setting-serve-rfc1918` must be enabled for this option to take effect.
 ''',
         'versionadded': ['5.1.3', '5.2.0'],
     },