Ensure serve-rfc1918 is enabled when doing serve-rfc6303

(cherry picked from commit 458a9064cc3e6eb56a8d6dfb7d501295dd1cf1dd)

diff --git a/pdns/recursordist/reczones.cc b/pdns/recursordist/reczones.cc
index c54f537ad371880707247fedde044a37690a9782..1fa8361fbfe1ba01d2b661e439f73688bef49b7e 100644 (file)
--- 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 bebb09a2eaf3f41f484d15ccd101378d8bcc6202..91824c126a94366da13105ca8a11c9c90cd9dfbf 100644 (file)
--- a/pdns/recursordist/settings/table.py
+++ b/pdns/recursordist/settings/table.py
@@ -2374,6 +2374,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'],
     },