- Document always_transparent, always_refuse, always_nxdomain types.

git-svn-id: file:///svn/unbound/trunk@3802 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index d322dd637459627b3ab88deb542f387a3ea04b89..da634ec988520b9c19f73c6700240b52adbeb231 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+30 June 2016: Wouter
+       - Document always_transparent, always_refuse, always_nxdomain types.
+
 29 June 2016: Wouter
        - Fix static compile on windows missing gdi32.
 

diff --git a/doc/example.conf.in b/doc/example.conf.in
index a5a3807f83c399b3fd796e45e6c0fc734e5b8cb0..768ee9debedeeace91b6a2d8d4c486478f877189 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -567,6 +567,8 @@ server:
        # o typetransparent resolves normally for other types and other names
        # o inform resolves normally, but logs client IP address
        # o inform_deny drops queries and logs client IP address
+       # o always_transparent, always_refuse, always_nxdomain, resolve in
+       #   that way but ignore local data for that name.
        #
        # defaults are localhost address, reverse for 127.0.0.1 and ::1
        # and nxdomain for AS112 zones. If you configure one of these zones

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index 6962b40319be9ad21f102808d05f041766eb52fe..486b74d32f107f5ccef13672ab8ce445561ef632 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -886,6 +886,7 @@ address space are not validated.  This is usually required whenever
 Configure a local zone. The type determines the answer to give if
 there is no match from local\-data. The types are deny, refuse, static,
 transparent, redirect, nodefault, typetransparent, inform, inform_deny,
+always_transparent, always_refuse, always_nxdomain,
 and are explained below. After that the default settings are listed. Use
 local\-data: to enter data into the local zone. Answers for local zones
 are authoritative DNS answers. By default the zones are class IN.
@@ -946,6 +947,15 @@ logged, eg. to run antivirus on them.
 The query is dropped, like 'deny', and logged, like 'inform'.  Ie. find
 infected machines without answering the queries.
 .TP 10
+\h'5'\fIalways_transparent\fR 
+Like transparent, but ignores local data and resolves normally.
+.TP 10
+\h'5'\fIalways_refuse\fR 
+Like refuse, but ignores local data and refuses the query.
+.TP 10
+\h'5'\fIalways_nxdomain\fR 
+Like static, but ignores local data and returns nxdomain for the query.
+.TP 10
 \h'5'\fInodefault\fR 
 Used to turn off default contents for AS112 zones. The other types
 also turn off default contents for the zone. The 'nodefault' option