X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/0ad2e0fcde2f23e3809687095bddb31f9af4896e..c5f280e20a8e3ecd5f016b8fb34a436588915ed2:/doc/doc-docbook/spec.xfpt diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index a102ad790..13d903b16 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -9736,7 +9736,7 @@ ${sort{3:2:1:4}{<}{$item}} .endd sorts a list of numbers, and .code -${sort {$lookup dnsdb{>:,,mx=example.com}} {<} {${listextract{1}{<,$item}}}} +${sort {${lookup dnsdb{>:,,mx=example.com}}} {<} {${listextract{1}{<,$item}}}} .endd will sort an MX lookup into priority order. @@ -16084,7 +16084,7 @@ See &%smtp_ratelimit_hosts%& above. See &%smtp_ratelimit_hosts%& above. -.option smtp_receive_timeout main time 5m +.option smtp_receive_timeout main time&!! 5m .cindex "timeout" "for SMTP input" .cindex "SMTP" "input timeout" This sets a timeout value for SMTP reception. It applies to all forms of SMTP @@ -16099,6 +16099,10 @@ SMTP data timeout on connection from... The former means that Exim was expecting to read an SMTP command; the latter means that it was in the DATA phase, reading the contents of a message. +If the first character of the option is a &"$"& the option is +expanded before use and may depend on +&$sender_host_name$&, &$sender_host_address$& and &$sender_host_port$&. + .oindex "&%-os%&" The value set by this option can be overridden by the @@ -27999,14 +28003,18 @@ is what is wanted for subsequent tests. .cindex "cutthrough" "requesting" This option requests delivery be attempted while the item is being received. -The option usable in the RCPT ACL. +The option is usable in the RCPT ACL. If enabled for a message recieved via smtp and routed to an smtp transport, -and the message has only one recipient, +and only one transport, interface, destination host and port combination +is used for all recipients of the message, then the delivery connection is made while the receiving connection is open and data is copied from one to the other. +An attempt to set this option for any recipient but the first +for a mail will be quietly ignored. If a recipient-verify callout connection is subsequently -requested in the same ACL it is held open and used for the data, +requested in the same ACL it is held open and used for +any subsequent receipients and the data, otherwise one is made after the initial RCPT ACL completes. Note that routers are used in verify mode, @@ -28018,12 +28026,13 @@ Headers may be modified by routers (subject to the above) and transports. Cutthrough delivery is not supported via transport-filters or when DKIM signing of outgoing messages is done, because it sends data to the ultimate destination before the entire message has been received from the source. +It is not supported for messages recieved with the SMTP PRDR option in use. Should the ultimate destination system positively accept or reject the mail, a corresponding indication is given to the source system and nothing is queued. If there is a temporary error the item is queued for later delivery in the usual fashion. If the item is successfully delivered in cutthrough mode -the log line is tagged with ">>" rather than "=>" and appears +the delivery log lines are tagged with ">>" rather than "=>" and appear before the acceptance "<=" line. Delivery in this mode avoids the generation of a bounce mail to a @@ -28815,7 +28824,7 @@ verified is redirected to a single address, verification continues with the new address, and in that case, the subsequent value of &$address_data$& is the value for the child address. -.vitem &*verify&~=&~reverse_host_lookup*& +.vitem &*verify&~=&~reverse_host_lookup/*&<&'options'&> .cindex "&%verify%& ACL condition" .cindex "&ACL;" "verifying host reverse lookup" .cindex "host" "verifying reverse lookup" @@ -28826,6 +28835,9 @@ Verification ensures that the host name obtained from a reverse DNS lookup, or one of its aliases, does, when it is itself looked up in the DNS, yield the original IP address. +There is one possible option, &`defer_ok`&. If this is present and a +DNS operation returns a temporary error, the verify condition succeeds. + If this condition is used for a locally generated message (that is, when there is no client host involved), it always succeeds. @@ -30699,14 +30711,23 @@ deny message = This message contains malware ($malware_name) .endd -.section "Scanning with SpamAssassin" "SECTscanspamass" +.section "Scanning with SpamAssassin and Rspamd" "SECTscanspamass" .cindex "content scanning" "for spam" .cindex "spam scanning" .cindex "SpamAssassin" +.cindex "Rspamd" The &%spam%& ACL condition calls SpamAssassin's &%spamd%& daemon to get a spam -score and a report for the message. You can get SpamAssassin at -&url(http://www.spamassassin.org), or, if you have a working Perl -installation, you can use CPAN by running: +score and a report for the message. +.new +Support is also provided for Rspamd (which can speak SpamAssassin's protocol but +provides reduced functionality when used in this mode). + +For more information about installation and configuration of SpamAssassin or +Rspamd refer to their respective websites at +&url(http://spamassassin.apache.org) and &url(http://www.rspamd.com) +.wen + +SpamAssassin can be installed with CPAN by running: .code perl -MCPAN -e 'install Mail::SpamAssassin' .endd @@ -30715,17 +30736,27 @@ documentation to see how you can tweak it. The default installation should work nicely, however. .oindex "&%spamd_address%&" -After having installed and configured SpamAssassin, start the &%spamd%& daemon. -By default, it listens on 127.0.0.1, TCP port 783. If you use another host or -port for &%spamd%&, you must set the &%spamd_address%& option in the global -part of the Exim configuration as follows (example): +By default, SpamAssassin listens on 127.0.0.1, TCP port 783 and if you +intend to use an instance running on the local host you do not need to set +&%spamd_address%&. If you intend to use another host or port for SpamAssassin, +you must set the &%spamd_address%& option in the global part of the Exim +configuration as follows (example): .code spamd_address = 192.168.99.45 387 .endd -You do not need to set this option if you use the default. As of version 2.60, -&%spamd%& also supports communication over UNIX sockets. If you want to use -these, supply &%spamd_address%& with an absolute file name instead of a -address/port pair: + +.new +To use Rspamd (which by default listens on all local addresses +on TCP port 11333) +you should add &%variant=rspamd%& after the address/port pair, for example: +.code +spamd_address = 127.0.0.1 11333 variant=rspamd +.endd +.wen + +As of version 2.60, &%SpamAssassin%& also supports communication over UNIX +sockets. If you want to us these, supply &%spamd_address%& with an absolute +file name instead of a address/port pair: .code spamd_address = /var/run/spamd_socket .endd @@ -30761,7 +30792,10 @@ The right-hand side of the &%spam%& condition specifies a name. This is relevant if you have set up multiple SpamAssassin profiles. If you do not want to scan using a specific profile, but rather use the SpamAssassin system-wide default profile, you can scan for an unknown name, or simply use &"nobody"&. -However, you must put something on the right-hand side. +.new +Rspamd does not use this setting. However, you must put something on the +right-hand side. +.wen The name allows you to use per-domain or per-user antispam profiles in principle, but this is not straightforward in practice, because a message may @@ -30815,6 +30849,14 @@ headers, since MUAs can match on such strings. .vitem &$spam_report$& A multiline text table, containing the full SpamAssassin report for the message. Useful for inclusion in headers or reject messages. + +.new +.vitem &$spam_action$& +For SpamAssassin either 'reject' or 'no action' depending on the +spam score versus threshold. +For Rspamd, the recommended action. +.wen + .endlist The &%spam%& condition caches its results unless expansion in @@ -34939,8 +34981,8 @@ selection marked by asterisks: &`*etrn `& ETRN commands &`*host_lookup_failed `& as it says &` ident_timeout `& timeout for ident connection -&` incoming_interface `& incoming interface on <= lines -&` incoming_port `& incoming port on <= lines +&` incoming_interface `& local interface on <= and => lines +&` incoming_port `& remote port on <= lines &`*lost_incoming_connection `& as it says (includes timeouts) &` outgoing_port `& add remote port to => lines &`*queue_run `& start and end queue runs @@ -35059,12 +35101,16 @@ routing email addresses, but it does apply to &"byname"& lookups. client's ident port times out. .next .cindex "log" "incoming interface" +.cindex "log" "local interface" +.cindex "log" "local address and port" +.cindex "TCP/IP" "logging local address and port" .cindex "interface" "logging" &%incoming_interface%&: The interface on which a message was received is added to the &"<="& line as an IP address in square brackets, tagged by I= and followed by a colon and the port number. The local interface and port are also -added to other SMTP log lines, for example &"SMTP connection from"&, and to -rejection lines. +added to other SMTP log lines, for example &"SMTP connection from"& and to +rejection lines +and (despite the name) the local interface is added to &"=>"& lines.. .next .cindex "log" "incoming remote port" .cindex "port" "logging remote"