And documentation.

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

diff --git a/doc/example.conf.in b/doc/example.conf.in
index 55a088951a34c530ec4b4fca235ef101a5d337ba..e9857b4972991d8db309e6f13402706e5cc1262e 100644 (file)
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
@@ -692,6 +692,9 @@ server:
        # Enable dns64 in module-config.  Used to synthesize IPv6 from IPv4.
        # dns64-prefix: 64:ff9b::0/96
 
+       # DNS64 ignore AAAA records for these domains and use A instead.
+       # dns64-ignore-aaaa: "example.com"
+
        # ratelimit for uncached, new queries, this limits recursion effort.
        # ratelimiting is experimental, and may help against randomqueryflood.
        # if 0(default) it is disabled, otherwise state qps allowed per zone.

diff --git a/doc/unbound.conf.5.in b/doc/unbound.conf.5.in
index c0ef1ab9127e9c670a12ed53f1ffe64b513db6f4..0197c0000122b8a499b23fc5d781f2938d76ddcd 100644 (file)
--- a/doc/unbound.conf.5.in
+++ b/doc/unbound.conf.5.in
@@ -1653,6 +1653,12 @@ It must be /96 or shorter.  The default prefix is 64:ff9b::/96.
 .B dns64\-synthall: \fI<yes or no>\fR
 Debug option, default no.  If enabled, synthesize all AAAA records
 despite the presence of actual AAAA records.
+.TP
+.B dns64\-ignore\-aaaa: \fI<name>\fR
+List domain for which the AAAA records are ignored and the A record is
+used by dns64 processing instead.  Can be entered multiple times, list a
+new domain for which it applies, one per line.  Applies also to names
+underneath the name given.
 .SS "DNSCrypt Options"
 .LP
 The