From 7e5297ef3a3cd50dbd92500e1d74364aefbd03ab Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 6 Jun 2015 20:53:21 +0100 Subject: [PATCH] Doc: Add DKIM info in main sections. Bug 1607 --- doc/doc-docbook/spec.xfpt | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 2f3e494db..c6b1e1bb0 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -11342,6 +11342,34 @@ This variable is available when Exim is compiled with the content-scanning extension and the obsolete &%demime%& condition. For details, see section &<>&. +.vitem &$dkim_cur_signer$& &&& + &$dkim_verify_status$& &&& + &$dkim_verify_reason$& &&& + &$dkim_domain$& &&& + &$dkim_identity$& &&& + &$dkim_selector$& &&& + &$dkim_algo$& &&& + &$dkim_canon_body$& &&& + &$dkim_canon_headers$& &&& + &$dkim_copiedheaders$& &&& + &$dkim_bodylength$& &&& + &$dkim_created$& &&& + &$dkim_expires$& &&& + &$dkim_headernames$& &&& + &$dkim_key_testing$& &&& + &$dkim_key_nosubdomains$& &&& + &$dkim_key_srvtype$& &&& + &$dkim_key_granularity$& &&& + &$dkim_key_notes$& +These variables are only available within the DKIM ACL. +For details see chapter &<>&. + +.vitem &$dkim_signers$& +.vindex &$dkim_signers$& +When a message has been received this variable contains +a colon-separated list of signer domains and identities for the message. +For details see chapter &<>&. + .vitem &$dnslist_domain$& &&& &$dnslist_matched$& &&& &$dnslist_text$& &&& @@ -13455,6 +13483,7 @@ listed in more than one group. See also the &'Policy controls'& section above. .table2 +.row &%dkim_verify_signers%& "DKIM domain for which DKIM ACL is run" .row &%host_lookup%& "host name looked up for these hosts" .row &%host_lookup_order%& "order of DNS and local name lookups" .row &%recipient_unqualified_hosts%& "may send unqualified recipients" @@ -13663,6 +13692,12 @@ is run for each recipient after an SMTP DATA command has been processed and the message itself has been received, but before the acknowledgment is sent. See chapter &<>& for further details. +.option acl_smtp_dkim main string&!! unset +.cindex DKIM "ACL for" +This option defines the ACL that is run for each DKIM signature +of a received message. +See chapter &<>& for further details. + .option acl_smtp_etrn main string&!! unset .cindex "ETRN" "ACL for" This option defines the ACL that is run when an SMTP ETRN command is @@ -14138,6 +14173,14 @@ etc. are ignored. If IP literals are enabled, the &(ipliteral)& router declines to handle IPv6 literal addresses. +.option dkim_verify_signers main "domain list&!!" $dkim_signers +.cindex DKIM "controlling calls to the ACL" +This option gives a list of DKIM domains for which the DKIM ACL is run. +It is expanded after the message is received; by default it runs +the ACL once for each signature in the message. +See chapter &<>&. + + .option dns_again_means_nonexist main "domain list&!!" unset .cindex "DNS" "&""try again""& response; overriding" DNS lookups give a &"try again"& response for the DNS errors @@ -27092,6 +27135,7 @@ options in the main part of the configuration. These options are: .cindex "EXPN" "ACL for" .cindex "HELO" "ACL for" .cindex "EHLO" "ACL for" +.cindex "DKIM" "ACL for" .cindex "MAIL" "ACL for" .cindex "QUIT, ACL for" .cindex "RCPT" "ACL for" @@ -27110,6 +27154,7 @@ options in the main part of the configuration. These options are: .irow &%acl_smtp_connect%& "ACL for start of SMTP connection" .irow &%acl_smtp_data%& "ACL after DATA is complete" .irow &%acl_smtp_data_prdr%& "ACL for each recipient, after DATA is complete" +.irow &%acl_smtp_dkim%& "ACL for each DKIM signer" .irow &%acl_smtp_etrn%& "ACL for ETRN" .irow &%acl_smtp_expn%& "ACL for EXPN" .irow &%acl_smtp_helo%& "ACL for HELO or EHLO" -- 2.25.1