From b7a314a7dc5385182b26296e7b3b2f280cf9ea49 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 5 Dec 2016 12:59:08 +0000 Subject: [PATCH] - Fix #1170: document that 'inform' local-zone uses local-data. git-svn-id: file:///svn/unbound/trunk@3944 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ doc/example.conf.in | 2 +- doc/unbound.conf.5.in | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index 3e0c388bc..81ecca31f 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +5 December 2016: Wouter + - Fix #1170: document that 'inform' local-zone uses local-data. + 1 December 2016: Ralph - hyphen as minus fix, by Andreas Schulze diff --git a/doc/example.conf.in b/doc/example.conf.in index 7255bdb65..a8d61d3a2 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -595,7 +595,7 @@ server: # o redirect serves the zone data for any subdomain in the zone. # o nodefault can be used to normally resolve AS112 zones. # o typetransparent resolves normally for other types and other names - # o inform resolves normally, but logs client IP address + # o inform acts like transparent, 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. diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in index 71a869660..755558acc 100644 --- a/doc/unbound.conf.5.in +++ b/doc/unbound.conf.5.in @@ -1001,11 +1001,11 @@ queries for www.example.com and www.foo.example.com are redirected, so that users with web browsers cannot access sites with suffix example.com. .TP 10 \h'5'\fIinform\fR -The query is answered normally. The client IP address (@portnumber) -is printed to the logfile. The log message is: timestamp, unbound-pid, -info: zonename inform IP@port queryname type class. This option can be -used for normal resolution, but machines looking up infected names are -logged, eg. to run antivirus on them. +The query is answered normally, same as transparent. The client IP +address (@portnumber) is printed to the logfile. The log message is: +timestamp, unbound-pid, info: zonename inform IP@port queryname type +class. This option can be used for normal resolution, but machines +looking up infected names are logged, eg. to run antivirus on them. .TP 10 \h'5'\fIinform_deny\fR The query is dropped, like 'deny', and logged, like 'inform'. Ie. find