Merge branch 'master' of ssh://git.exim.org/home/git/exim

diff --combined doc/doc-docbook/spec.xfpt
index 623ce535ae952ec466b30325c98361baf83e7aa6,0ecbaac5a9d3de3e421b11e108364fca73b25b00..afc15d4330c9c0f40cc84e8b1a867e2f4862f1fc
--- 1/doc/doc-docbook/spec.xfpt
--- 2/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@@ -4221,20 -4221,6 +4221,20 @@@ option sets the IP interface address va
  using the same syntax as for &%-oMa%&. The interface address is placed in
  &$received_ip_address$& and the port number, if present, in &$received_port$&.
  
 +.vitem &%-oMm%&&~<&'message&~reference'&>
 +.oindex "&%-oMm%&"
 +.cindex "message reference" "message reference, specifying for local message"
 +See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMm%&
 +option sets the message reference, e.g. message-id, and is logged during
 +delivery. This is useful when some kind of audit trail is required to tie
 +messages together. The format of the message reference is checked and will
 +abort if the format is invalid. The option will only be accepted if exim is
 +running in trusted mode, not as any regular user.
 +
 +The best example of a message reference is when Exim sends a bounce message.
 +The message reference is the message-id of the original message for which Exim
 +is sending the bounce.
 +
  .vitem &%-oMr%&&~<&'protocol&~name'&>
  .oindex "&%-oMr%&"
  .cindex "protocol, specifying for local message"
@@@ -11471,7 -11457,7 +11471,7 @@@ the space value is -1. See also the &%c
  .vitem &$lookup_dnssec_authenticated$&
  .vindex "&$lookup_dnssec_authenticated$&"
  This variable is set after a DNS lookup done by
- either a dnslookup router or a dnsdb lookup expansion.
+ a dnsdb lookup expansion, dnslookup router or smtp transport.
  It will be empty if &(DNSSEC)& was not requested,
  &"no"& if the result was not labelled as authenticated data
  and &"yes"& if it was.
@@@ -17687,8 -17673,6 +17687,6 @@@ when there is a DNS lookup error
  DNS lookups for domains matching &%dnssec_request_domains%& will be done with
  the dnssec request bit set.
  This applies to all of the SRV, MX A6, AAAA, A lookup sequence.
- 
- See also the &$lookup_dnssec_authenticated$& variable.
  .wen
  
  
@@@ -22610,6 -22594,33 +22608,33 @@@ See the &%search_parents%& option in ch
  details.
  
  
+ .new
+ .option dnssec_request_domains smtp "domain list&!!" unset
+ .cindex "MX record" "security"
+ .cindex "DNSSEC" "MX lookup"
+ .cindex "security" "MX lookup"
+ .cindex "DNS" "DNSSEC"
+ DNS lookups for domains matching &%dnssec_request_domains%& will be done with
+ the dnssec request bit set.
+ This applies to all of the SRV, MX A6, AAAA, A lookup sequence.
+ .wen
+ 
+ 
+ 
+ .new
+ .option dnssec_require_domains smtp "domain list&!!" unset
+ .cindex "MX record" "security"
+ .cindex "DNSSEC" "MX lookup"
+ .cindex "security" "MX lookup"
+ .cindex "DNS" "DNSSEC"
+ DNS lookups for domains matching &%dnssec_request_domains%& will be done with
+ the dnssec request bit set.  Any returns not having the Authenticated Data bit
+ (AD bit) set wil be ignored and logged as a host-lookup failure.
+ This applies to all of the SRV, MX A6, AAAA, A lookup sequence.
+ .wen
+ 
+ 
+ 
  .option dscp smtp string&!! unset
  .cindex "DCSP" "outbound"
  This option causes the DSCP value associated with a socket to be set to one

diff --combined doc/doc-txt/ChangeLog
index 7f01919c2055a48e9bf19540a98ad56bd7e0fbd9,d4240fa29251df957168219a1af19b3701362982..172748584d677270bb1889d1f7c1d5aa5abbdc41
--- 1/doc/doc-txt/ChangeLog
--- 2/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -85,7 -85,8 +85,8 @@@ TL/07 Add new dmarc expansion variable 
  JH/13 Fix handling of $tls_cipher et.al. in (non-verify) transport.  Bug 1455.
  
  JH/14 New options dnssec_request_domains, dnssec_require_domains on the
-       dnslookup router (applying to the forward lookup).
+       dnslookup router and the smtp transport (applying to the forward
+       lookup).
  
  TL/08 Bugzilla 1453: New LDAP "SERVERS=" option allows admin to override list
        of ldap servers used for a specific lookup.  Patch provided by Heiko
@@@ -99,10 -100,6 +100,10 @@@ TL/09 Bugzilla 609: Add -C option to ex
  
  JH/19 EXPERIMENTAL_OCSP support under GnuTLS.  Bug 1459.
  
 +TL/10 Bugzilla 1454: New -oMm option to pass message reference to Exim.
 +      Requires trusted mode and valid format message id, aborts otherwise.
 +      Patch contributed by Heiko Schlichting.
 +
  
  Exim version 4.82
  -----------------