X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/237e7c0ad8014d8a746dd912867a8cdfadc5061d..0b56b50791f84fca479ad9bb9b0ce789959e3a2e:/doc/doc-docbook/spec.xfpt?ds=inline diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index df648d932..3498893a6 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -3811,6 +3811,12 @@ This option is not intended for use by external callers. It is used internally by Exim in conjunction with the &%-MC%& option. It signifies that the connection to the remote host has been authenticated. +.vitem &%-MCD%& +.oindex "&%-MCD%&" +This option is not intended for use by external callers. It is used internally +by Exim in conjunction with the &%-MC%& option. It signifies that the +remote host supports the ESMTP &_DSN_& extension. + .vitem &%-MCP%& .oindex "&%-MCP%&" This option is not intended for use by external callers. It is used internally @@ -4640,6 +4646,13 @@ this option. .oindex "&%-X%&" This option is interpreted by Sendmail to cause debug information to be sent to the named file. It is ignored by Exim. + +.vitem &%-z%&&~<&'log-line'&> +.oindex "&%-z%&" +This option writes its argument to Exim's logfile. +Use is restricted to administrators; the intent is for operational notes. +Quotes should be used to maintain a multi-word item as a single argument, +under most shells. .endlist .ecindex IIDclo1 @@ -13425,6 +13438,7 @@ See also the &'Policy controls'& section above. .table2 .row &%accept_8bitmime%& "advertise 8BITMIME" .row &%auth_advertise_hosts%& "advertise AUTH 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" .row &%pipelining_advertise_hosts%& "advertise pipelining to these hosts" @@ -14166,6 +14180,18 @@ This is an obsolete option that is now a no-op. It used to affect the way Exim handled CR and LF characters in incoming messages. What happens now is described in section &<>&. +.option dsn_advertise_hosts main "host list&!!" unset +.cindex "bounce messages" "success" +.cindex "DSN" "success" +.cindex "Delivery Status Notification" "success" +DSN extensions (RFC3461) will be advertised in the EHLO message to, +and accepted from, these hosts. +Hosts may use the NOTIFY and ENVID options on RCPT TO commands, +and RET and ORCPT options on MAIL FROM commands. +A NOTIFY=SUCCESS option requests success-DSN messages. +A NOTIFY= option with no argument requests that no delay or failure DSNs +are sent. + .option dsn_from main "string&!!" "see below" .cindex "&'From:'& header line" "in bounces" .cindex "bounce messages" "&'From:'& line, specifying" @@ -16994,6 +17020,15 @@ This option must always be set. It specifies which of the available routers is to be used. +.option dsn_lasthop routers boolean false +.cindex "DSN" "success" +.cindex "Delivery Status Notification" "success" +If this option is set true, and extended DSN (RFC3461) processing is in effect, +Exim will not pass on DSN requests to downstream DSN-aware hosts but will +instead send a success DSN as if the next hop does not support DSN. +Not effective on redirect routers. + + .option errors_to routers string&!! unset .cindex "envelope sender" @@ -19000,6 +19035,11 @@ However, there are some private options which define transports for delivery to files and pipes, and for generating autoreplies. See the &%file_transport%&, &%pipe_transport%& and &%reply_transport%& descriptions below. +If success DSNs have been requested +.cindex "DSN" "success" +.cindex "Delivery Status Notification" "success" +redirection triggers one and the DSN options are not passed any further. + .section "Redirection data" "SECID124" @@ -30310,10 +30350,12 @@ It supports a &"generic"& interface to scanners called via the shell, and specialized interfaces for &"daemon"& type virus scanners, which are resident in memory and thus are much faster. +A timeout of 2 minutes is applied to a scanner call (by default); +if it expires then a defer action is taken. .oindex "&%av_scanner%&" -You can set the &%av_scanner%& option in first part of the Exim configuration -file to specify which scanner to use, together with any additional options that +You can set the &%av_scanner%& option in the main part of the configuration +to specify which scanner to use, together with any additional options that are needed. The basic syntax is as follows: .display &`av_scanner = <`&&'scanner-type'&&`>:<`&&'option1'&&`>:<`&&'option2'&&`>:[...]`& @@ -30541,7 +30583,8 @@ which case each use of the &%malware%& condition causes a new scan of the message. The &%malware%& condition takes a right-hand argument that is expanded before -use. It can then be one of +use and taken as a list, slash-separated by default. +The first element can then be one of .ilist &"true"&, &"*"&, or &"1"&, in which case the message is scanned for viruses. @@ -30554,11 +30597,21 @@ the condition fails immediately. A regular expression, in which case the message is scanned for viruses. The condition succeeds if a virus is found and its name matches the regular expression. This allows you to take special actions on certain types of virus. +Note that &"/"& characters in the RE must be doubled due to the list-processing, +unless the separator is changed (in the usual way). .endlist -You can append &`/defer_ok`& to the &%malware%& condition to accept messages -even if there is a problem with the virus scanner. Otherwise, such a problem -causes the ACL to defer. +You can append a &`defer_ok`& element to the &%malware%& argument list to accept +messages even if there is a problem with the virus scanner. +Otherwise, such a problem causes the ACL to defer. + +You can append a &`tmo=`& element to the &%malware%& argument list to +specify a non-default timeout. The default is two minutes. +For example: +.code +malware = * / defer_ok / tmo=10s +.endd +A timeout causes the ACL to defer. .vindex "&$malware_name$&" When a virus is found, the condition sets up an expansion variable called @@ -33501,13 +33554,8 @@ failing addresses with their error messages. The third item is used to introduce any text from pipe transports that is to be returned to the sender. It is omitted if there is no such text. .next -The fourth item is used to introduce the copy of the message that is returned -as part of the error report. -.next -The fifth item is added after the fourth one if the returned message is -truncated because it is bigger than &%return_size_limit%&. -.next -The sixth item is added after the copy of the original message. +The fourth, fifth and sixth items will be ignored and may be empty. +The fields exist for back-compatibility .endlist The default state (&%bounce_message_file%& unset) is equivalent to the