summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/dns-forwarding/recursor.conf.tmpl6
-rw-r--r--interface-definitions/dns-forwarding.xml.in16
2 files changed, 22 insertions, 0 deletions
diff --git a/data/templates/dns-forwarding/recursor.conf.tmpl b/data/templates/dns-forwarding/recursor.conf.tmpl
index 8799718b0..cc9612ca8 100644
--- a/data/templates/dns-forwarding/recursor.conf.tmpl
+++ b/data/templates/dns-forwarding/recursor.conf.tmpl
@@ -29,5 +29,11 @@ local-address={{ listen_address | join(',') }}
# dnssec
dnssec={{ dnssec }}
+{# dns: T3277: #}
+{% if serve_rfc1918 is defined and serve_rfc1918 == 'no' %}
+# serve-rfc1918
+serve-rfc1918=no
+{% endif %}
+
forward-zones-file=recursor.forward-zones.conf
diff --git a/interface-definitions/dns-forwarding.xml.in b/interface-definitions/dns-forwarding.xml.in
index 66b4db403..789a6562b 100644
--- a/interface-definitions/dns-forwarding.xml.in
+++ b/interface-definitions/dns-forwarding.xml.in
@@ -111,6 +111,22 @@
<valueless/>
</properties>
</leafNode>
+ <leafNode name="serve-rfc1918">
+ <properties>
+ <help>Makes the server authoritatively aware of RFC1918 addresses</help>
+ <completionHelp>
+ <list>yes no</list>
+ </completionHelp>
+ <valueHelp>
+ <format>yes</format>
+ <description>Authoritatively aware about RFC1918 addresses (Default)</description>
+ </valueHelp>
+ <valueHelp>
+ <format>no</format>
+ <description>Authoritatively not aware about RFC1918 addresses</description>
+ </valueHelp>
+ </properties>
+ </leafNode>
<leafNode name="allow-from">
<properties>
<help>Networks allowed to query this server</help>