Gitweb:
http://git.exim.org/exim.git/commitdiff/72c9e342b1a4a410efc165a38281da2f5b69ad90
Commit: 72c9e342b1a4a410efc165a38281da2f5b69ad90
Parent: 2247672183a05fed9ed58d900b96431a4eddb2a1
Author: Phil Pennock <pdp@???>
AuthorDate: Sun Mar 2 15:48:02 2014 -0500
Committer: Phil Pennock <pdp@???>
CommitDate: Sun Mar 2 15:48:02 2014 -0500
Fix docs, `dns_dnssec_ok` not `dns_use_dnssec`
The variable rename in 4.82 PP/19 (commit 0fbd9bff) was incomplete, I
missed changing the documentation. :(
---
doc/doc-docbook/spec.xfpt | 25 +++++++++++++------------
doc/doc-txt/ChangeLog | 3 +++
doc/doc-txt/OptionLists.txt | 2 +-
3 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index edb577a..ece837d 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -11978,7 +11978,7 @@ other times, this variable is false.
It is likely that you will need to coerce DNSSEC support on in the resolver
library, by setting:
.code
-dns_use_dnssec = 1
+dns_dnssec_ok = 1
.endd
Exim does not perform DNSSEC validation itself, instead leaving that to a
@@ -13190,10 +13190,10 @@ See also the &'Policy controls'& section above.
.row &%disable_ipv6%& "do no IPv6 processing"
.row &%dns_again_means_nonexist%& "for broken domains"
.row &%dns_check_names_pattern%& "pre-DNS syntax check"
+.row &%dns_dnssec_ok%& "parameter for resolver"
.row &%dns_ipv4_lookup%& "only v4 lookup for these domains"
.row &%dns_retrans%& "parameter for resolver"
.row &%dns_retry%& "parameter for resolver"
-.row &%dns_use_dnssec%& "parameter for resolver"
.row &%dns_use_edns0%& "parameter for resolver"
.row &%hold_domains%& "hold delivery for these domains"
.row &%local_interfaces%& "for routing checks"
@@ -13814,6 +13814,17 @@ This option controls whether or not an IP address, given as a CSA domain, is
reversed and looked up in the reverse DNS, as described in more detail in
section &<<SECTverifyCSA>>&.
+
+.option dns_dnssec_ok main integer -1
+.cindex "DNS" "resolver options"
+.cindex "DNS" "DNSSEC"
+If this option is set to a non-negative number then Exim will initialise the
+DNS resolver library to either use or not use DNSSEC, overriding the system
+default. A value of 0 coerces DNSSEC off, a value of 1 coerces DNSSEC on.
+
+If the resolver library does not support DNSSEC then this option has no effect.
+
+
.option dns_ipv4_lookup main "domain list&!!" unset
.cindex "IPv6" "DNS lookup for AAAA records"
.cindex "DNS" "IPv6 lookup for AAAA records"
@@ -13844,16 +13855,6 @@ to set in them.
See &%dns_retrans%& above.
-.option dns_use_dnssec main integer -1
-.cindex "DNS" "resolver options"
-.cindex "DNS" "DNSSEC"
-If this option is set to a non-negative number then Exim will initialise the
-DNS resolver library to either use or not use DNSSEC, overriding the system
-default. A value of 0 coerces DNSSEC off, a value of 1 coerces DNSSEC on.
-
-If the resolver library does not support DNSSEC then this option has no effect.
-
-
.option dns_use_edns0 main integer -1
.cindex "DNS" "resolver options"
.cindex "DNS" "EDNS0"
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index d5c09f4..082caa8 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -32,6 +32,9 @@ JH/02 Add ${listextract {number}{list}{success}{fail}}.
TL/03 Bugzilla 1433: Fix DMARC SEGV with specific From header contents.
Properly escape header and check for NULL return.
+PP/01 Continue incomplete 4.82 PP/19 by fixing docs too: use dns_dnssec_ok
+ not dns_use_dnssec.
+
Exim version 4.82
-----------------
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 9c909f2..4ad1121 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -180,12 +180,12 @@ dns_again_means_nonexist domain list unset main
dns_check_names_pattern string + main 2.11
dns_csa_search_limit integer 5 main 4.60
dns_csa_use_reverse boolean true main 4.60
+dns_dnssec_ok integer -1 main 4.82
dns_ipv4_lookup boolean false main 3.20
dns_qualify_single boolean true smtp
dns_retrans time 0s main 1.60
dns_retry integer 0 main 1.60
dns_search_parents boolean false smtp
-dns_use_dnssec integer -1 main 4.82
dns_use_edns0 integer -1 main 4.76
domains domain list unset routers 4.00
driver string unset authenticators
