X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/dcc27345372eba5d957fbcdfbe2bef0f8e66269a..dea4897244b409bf91dc60a7e5e4b3d06f123dd6:/doc/doc-docbook/spec.xfpt?ds=sidebyside diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 8e5c31049..d18dd0ce1 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -10090,6 +10090,21 @@ Last:user@example.com user@example.com .endd +.new +.vitem &*${base32:*&<&'digits'&>&*}*& +.cindex "&%base32%& expansion item" +.cindex "expansion" "conversion to base 32" +The string must consist entirely of decimal digits. The number is converted to +base 32 and output as a (empty, for zero) string of characters. +Only lowercase letters are used. + +.vitem &*${base32d:*&<&'base-32&~digits'&>&*}*& +.cindex "&%base32d%& expansion item" +.cindex "expansion" "conversion to base 32" +The string must consist entirely of base-32 digits. +The number is converted to decimal and output as a string. +.wen + .vitem &*${base62:*&<&'digits'&>&*}*& .cindex "&%base62%& expansion item" .cindex "expansion" "conversion to base 62" @@ -13801,6 +13816,7 @@ See also the &'Policy controls'& section above. .table2 .row &%accept_8bitmime%& "advertise 8BITMIME" .row &%auth_advertise_hosts%& "advertise AUTH to these hosts" +.row &%chunking_advertise_hosts%& "advertise CHUNKING to these hosts" .row &%dsn_advertise_hosts%& "advertise DSN extensions to these hosts" .row &%ignore_fromline_hosts%& "allow &""From ""& from these hosts" .row &%ignore_fromline_local%& "allow &""From ""& from local SMTP" @@ -14358,6 +14374,15 @@ For non-SMTP input and for batched SMTP input, the test is done at start-up; on failure a message is written to stderr and Exim exits with a non-zero code, as it obviously cannot send an error message of any kind. +.new +.option chunking_advertise_hosts main "host list&!!" * +.cindex CHUNKING advertisement +.cindex "RFC 3030" "CHUNKING" +The CHUNKING extension (RFC3030) will be advertised in the EHLO message to +these hosts. +Hosts may use the BDAT command as an alternate to DATA. +.wen + .option daemon_smtp_ports main string &`smtp`& .cindex "port" "for daemon" .cindex "TCP/IP" "setting listening ports" @@ -17572,7 +17597,7 @@ This applies to all of the SRV, MX, AAAA, A lookup sequence. .cindex "DNSSEC" "MX lookup" .cindex "security" "MX lookup" .cindex "DNS" "DNSSEC" -DNS lookups for domains matching &%dnssec_request_domains%& will be done with +DNS lookups for domains matching &%dnssec_require_domains%& will be done with the dnssec request bit set. Any returns not having the Authenticated Data bit (AD bit) set will be ignored and logged as a host-lookup failure. This applies to all of the SRV, MX, AAAA, A lookup sequence. @@ -19873,12 +19898,17 @@ list1: :include:/opt/lists/list1 .endd .next .cindex "address redirection" "to black hole" -Sometimes you want to throw away mail to a particular local part. Making the -&%data%& option expand to an empty string does not work, because that causes -the router to decline. Instead, the alias item +.cindex "delivery" "discard" +.cindex "delivery" "blackhole" .cindex "black hole" .cindex "abandoning mail" -&':blackhole:'& can be used. It does what its name implies. No delivery is +Sometimes you want to throw away mail to a particular local part. Making the +&%data%& option expand to an empty string does not work, because that causes +the router to decline. Instead, the alias item +.code +:blackhole: +.endd +can be used. It does what its name implies. No delivery is done, and no error message is generated. This has the same effect as specifying &_/dev/null_& as a destination, but it can be independently disabled. @@ -20848,7 +20878,7 @@ is forced to fail, no action is taken. Other expansion failures are treated as errors and cause the delivery to be deferred. Unlike most options, &%headers_remove%& can be specified multiple times -for a router; all listed headers are removed. +for a transport; all listed headers are removed. &*Warning*&: Because of the separate expansion of the list items, items that contain a list separator must have it doubled. @@ -23616,7 +23646,7 @@ This applies to all of the SRV, MX, AAAA, A lookup sequence. .cindex "DNSSEC" "MX lookup" .cindex "security" "MX lookup" .cindex "DNS" "DNSSEC" -DNS lookups for domains matching &%dnssec_request_domains%& will be done with +DNS lookups for domains matching &%dnssec_require_domains%& will be done with the dnssec request bit set. Any returns not having the Authenticated Data bit (AD bit) set will be ignored and logged as a host-lookup failure. This applies to all of the SRV, MX, AAAA, A lookup sequence. @@ -23871,6 +23901,16 @@ connects. If authentication fails, Exim will try to transfer the message unauthenticated. See also &%hosts_require_auth%&, and chapter &<>& for details of authentication. +.new +.option hosts_try_chunking smtp "host list&!!" * +.cindex CHUNKING "enabling, in client" +.cindex BDAT "SMTP command" +.cindex "RFC 3030" "CHUNKING" +This option provides a list of server to which, provided they announce +CHUNKING support, Exim will attempt to use BDAT commands rather than DATA. +BDAT will not be used in conjuction with a transport filter. +.wen + .option hosts_try_prdr smtp "host list&!!" * .cindex "PRDR" "enabling, optional in client" This option provides a list of servers to which, provided they announce @@ -27741,6 +27781,17 @@ received, before the final response to the DATA command is sent. This is the ACL specified by &%acl_smtp_data%&, which is the second ACL that is associated with the DATA command. +.new +.cindex CHUNKING "BDAT command" +.cindex BDAT "SMTP command" +.cindex "RFC 3030" CHUNKING +If CHUNKING was advertised and a BDAT command sequence is received, +the &%acl_smtp_predata%& ACL is not run. +. XXX why not? It should be possible, for the first BDAT. +The &%acl_smtp_data%& is run after the last BDAT command and all of +the data specified is received. +.wen + For both of these ACLs, it is not possible to reject individual recipients. An error response rejects the entire message. Unfortunately, it is known that some MTAs do not treat hard (5&'xx'&) responses to the DATA command (either @@ -29044,7 +29095,7 @@ any ACL verb, including &%deny%& (though this is potentially useful only in a RCPT ACL). Headers will not be added to the message if the modifier is used in -DATA, MIME or DKIM ACLs for messages delivered by cutthrough routing. +DATA, MIME or DKIM ACLs for a message delivered by cutthrough routing. Leading and trailing newlines are removed from the data for the &%add_header%& modifier; if it then @@ -29145,8 +29196,8 @@ receiving a message). The message must ultimately be accepted for with any ACL verb, including &%deny%&, though this is really not useful for any verb that doesn't result in a delivered message. -Headers will not be removed to the message if the modifier is used in -DATA, MIME or DKIM ACLs for messages delivered by cutthrough routing. +Headers will not be removed from the message if the modifier is used in +DATA, MIME or DKIM ACLs for a message delivered by cutthrough routing. More than one header can be removed at the same time by using a colon separated list of header names. The header matching is case insensitive. Wildcards are @@ -31524,7 +31575,7 @@ condition defers. Unix and TCP socket specifications may be mixed in any order. Each element of the list is a list itself, space-separated by default -and changeable in the usual way. +and changeable in the usual way; take care to not double the separator. For TCP socket specifications a host name or IP (v4 or v6, but subject to list-separator quoting rules) address can be used, @@ -31651,6 +31702,11 @@ spam bar is 50 characters. A multiline text table, containing the full SpamAssassin report for the message. Useful for inclusion in headers or reject messages. This variable is only usable in a DATA-time ACL. +.new +Beware that SpamAssassin may return non-ASCII characters, especially +when running in country-specific locales, which are not legal +unencoded in headers. +.wen .vitem &$spam_action$& For SpamAssassin either 'reject' or 'no action' depending on the @@ -35388,6 +35444,7 @@ picked out by the distinctive two-character flags that immediately follow the timestamp. The flags are: .display &`<=`& message arrival +&`(=`& message fakereject &`=>`& normal message delivery &`->`& additional address in same delivery &`>>`& cutthrough message delivery @@ -35620,10 +35677,12 @@ the following table: &`F `& sender address (on delivery lines) &`H `& host name and IP address &`I `& local interface used +&`K `& CHUNKING extension used &`id `& message id for incoming message &`P `& on &`<=`& lines: protocol used &` `& on &`=>`& and &`**`& lines: return path -&`PRX `& on &'<='& and&`=>`& lines: proxy address +&`PRDR`& PRDR extension used +&`PRX `& on &'<='& and &`=>`& lines: proxy address &`Q `& alternate queue name &`QT `& on &`=>`& lines: time spent on queue so far &` `& on &"Completed"& lines: time spent on queue @@ -38058,7 +38117,7 @@ senders). .section "Signing outgoing messages" "SECDKIMSIGN" .cindex "DKIM" "signing" -Signing is implemented by setting private options on the SMTP transport. +Signing is enabled by setting private options on the SMTP transport. These options take (expandable) strings as arguments. .option dkim_domain smtp string&!! unset @@ -38115,7 +38174,7 @@ used. .section "Verifying DKIM signatures in incoming mail" "SECID514" .cindex "DKIM" "verification" -Verification of DKIM signatures in incoming email is implemented via the +Verification of DKIM signatures in SMTP incoming email is implemented via the &%acl_smtp_dkim%& ACL. By default, this ACL is called once for each syntactically(!) correct signature in the incoming message. A missing ACL definition defaults to accept.