[exim-cvs] cvs commit: exim/exim-doc/doc-src filter.src spec…

Góra strony
Delete this message
Reply to this message
Autor: Philip Hazel
Data:  
Dla: exim-cvs
Temat: [exim-cvs] cvs commit: exim/exim-doc/doc-src filter.src spec.src exim/exim-src ACKNOWLEDGMENTS README.UPDATING
ph10 2005/01/11 15:17:52 GMT

  Modified files:
    exim-doc/doc-src     filter.src spec.src 
    exim-src             ACKNOWLEDGMENTS README.UPDATING 
  Log:
  Updated filter source; preliminary update of ACL chapter and addition of
  new content scanning chapter in the main doc source; updated
  ACKNOWLEDGMENTS from Tom's list for the virus scanners.


  Revision  Changes      Path
  1.2       +286 -195    exim/exim-doc/doc-src/filter.src
  1.2       +2753 -1784  exim/exim-doc/doc-src/spec.src
  1.12      +4 -0        exim/exim-src/ACKNOWLEDGMENTS
  1.3       +5 -5        exim/exim-src/README.UPDATING


  Index: filter.src
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-src/filter.src,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filter.src    7 Oct 2004 15:04:35 -0000    1.1
  +++ filter.src    11 Jan 2005 15:17:51 -0000    1.2
  @@ -1,4 +1,4 @@
  -. $Cambridge: exim/exim-doc/doc-src/filter.src,v 1.1 2004/10/07 15:04:35 ph10 Exp $
  +. $Cambridge: exim/exim-doc/doc-src/filter.src,v 1.2 2005/01/11 15:17:51 ph10 Exp $
   .
   .if !set style
   .library "a4ps"
  @@ -82,9 +82,9 @@
   .set chapter -1
   .chapter Exim's interfaces to mail filtering
   .space -2ld
  -Exim is a mail transfer agent for Unix-like systems. This document describes
  -the user interfaces to its in-built mail filtering facilities, and is copyright
  -(c) University of Cambridge 2004. It corresponds to Exim version 4.40.
  +This document describes the user interfaces to Exim's in-built mail filtering
  +facilities, and is copyright (c) University of Cambridge 2005. It corresponds
  +to Exim version 4.50.
   .rule


. ---------------------------------------------------------------------------
@@ -96,8 +96,8 @@

.if ~~sgcal
.space 1ld
-$chead{Contents}
-.space 1ld
+. $chead{Contents}
+. space 1ld
.tabset 2em 2em
.push
.linedepth ~~sys.linedepth - 1
@@ -143,15 +143,6 @@
what has been enabled. In the absence of this, consult your system
administrator.

-It is important to realize that, in Exim, no deliveries are actually made while
-a filter or traditional \(.forward)\ file is being processed. The result of
-such processing is a list of destinations to which a message should be
-delivered -- the deliveries themselves take place later, along with all other
-deliveries for the message. This means that it is not possible to test for
-successful deliveries while filtering. It also means that any duplicate
-addresses that are generated are dropped, since Exim never delivers the same
-message to the same address more than once.
-
This document describes how to use a filter file and the format of its
contents. It is intended for use by end-users. Both Sieve filters and Exim
filters are covered. However, for Sieve filters, only issues that relate to the
@@ -164,6 +155,23 @@
Exim specification, which also describes how the system administrator can set
up and control the use of filtering.

+
+.em
+.section Filter operation
+It is important to realize that, in Exim, no deliveries are actually made while
+a filter or traditional \(.forward)\ file is being processed. Running a filter
+or processing a traditional \(.forward)\ file sets up future delivery
+operations, but does not carry them out.
+
+The result of filter or \(.forward)\ file processing is a list of destinations
+to which a message should be delivered. The deliveries themselves take place
+later, along with all other deliveries for the message. This means that it is
+not possible to test for successful deliveries while filtering. It also means
+that any duplicate addresses that are generated are dropped, because Exim never
+delivers the same message to the same address more than once.
+.nem
+
+
.section Testing a new filter file
.rset SECTtesting "~~chapter.~~section"
Filter files, especially the more complicated ones, should always be tested, as
@@ -300,10 +308,14 @@
This chapter does not contain a description of Sieve, since that can be found
in RFC 3028, which should be read in conjunction with these notes.

-The Exim Sieve implementation offers the core as defined by RFC 3028, the
-\%envelope%\ and the \%fileinto%\ extensions, but not the \%reject%\ extension.
-Exim does not support message delivery notifications (MDNs), so adding it just
-to the Sieve filter (as required for \%reject%\) makes little sense.
+The Exim Sieve implementation offers the core as defined by RFC 3028,
+.em
+comparison tests, the \%copy%\, \%envelope%\, \%fileinto%\, and \%vacation%\
+extensions,
+.nem
+but not the \%reject%\ extension. Exim does not support message delivery
+notifications (MDNs), so adding it just to the Sieve filter (as required for
+\%reject%\) makes little sense.

In order for Sieve to work properly in Exim, the system administrator needs to
make some adjustments to the Exim configuration. These are described in the
@@ -588,6 +600,11 @@

\$body@_linecount$\: The number of lines in the body of the message.

+.em
+\$body@_zerocount$\: The number of binary zero characters in the body of the
+message.
+.nem
+
\$home$\: In conventional configurations, this variable normally contains the
user's home directory. The system administrator can, however, change this.

@@ -726,26 +743,44 @@


.section Significant deliveries
+.rset SECTsigdel "~~chapter.~~section"
When in the course of delivery a message is processed by a filter file, what
-happens next, that is, after the whole filter file has been processed, depends
-on whether the filter has set up any $it{significant deliveries} or not. If
-there is at least one significant delivery, the filter is considered to
-have handled the entire delivery arrangements for the current address, and no
-further processing of the address takes place. If, however, no significant
-deliveries have been set up, Exim continues processing the current address as
-if there were no filter file, and typically sets up a delivery of a copy of the
-message into a local mailbox. In particular, this happens in the special case
-of a filter file containing only comments.
+happens next, that is, after the filter file has been processed, depends on
+whether or not the filter sets up any $it{significant deliveries}. If at least
+one significant delivery is set up, the filter is considered to have handled
+the entire delivery arrangements for the current address, and no further
+processing of the address takes place. If, however, no significant deliveries
+are set up, Exim continues processing the current address as if there were no
+filter file, and typically sets up a delivery of a copy of the message into a
+local mailbox. In particular, this happens in the special case of a filter file
+containing only comments.

The delivery commands \"deliver"\, \"save"\, and \"pipe"\ are by default
significant. However, if such a command is preceded by the word \"unseen"\, its
delivery is not considered to be significant. In contrast, other commands such
-as \"mail"\ and \"vacation"\ do not count as significant deliveries unless
+as \"mail"\ and \"vacation"\ do not set up significant deliveries unless
preceded by the word \"seen"\.

+.em
+The following example commands set up significant deliveries:
+.display asis
+deliver jack@???
+pipe $home/bin/mymailscript
+seen mail subject "message discarded"
+seen finish
+.endd
+The following example commands do not set up significant deliveries:
+.display asis
+unseen deliver jack@???
+unseen pipe $home/bin/mymailscript
+mail subject "message discarded"
+finish
+.endd
+.nem
+

.section Filter commands
-The filter commands which are described in subsequent sections are listed
+The filter commands that are described in subsequent sections are listed
below, with the section in which they are described in brackets:
.display rm
.tabs 15
@@ -764,11 +799,14 @@
\testprint\ $t print while testing (section ~~SECTtestprint)
\vacation\ $t tailored form of \mail\ (section ~~SECTmail)
.endd
-In addition, when Exim's filtering facilities are being used as a system
-filter, the \"fail"\, \"freeze"\, and \"headers"\ commands are available.
-However, since they are usable only by the system administrator and not by
-ordinary users, they are described in the main Exim specification rather than
-in this document.
+.em
+The \"headers"\ command has additional parameters that can be used only in a
+system filter. The \"fail"\ and \"freeze"\ commands are available only when
+Exim's filtering facilities are being used as a system filter, and are
+therefore usable only by the system administrator and not by ordinary users.
+They are mentioned only briefly in this document; for more information, see the
+main Exim specification.
+.nem

   .section The add command
   .rset SECTadd "~~chapter.~~section"
  @@ -776,11 +814,12 @@
        add <<number>> to <<user variable>>
   e.g. add 2 to n3
   .endd
  -There are 10 user variables of this type, and their values can be obtained by
  -the normal expansion syntax (for example \$n3$\) in other commands. At the
  -start of filtering, these variables all contain zero. Both arguments of the
  -\"add"\ command are expanded before use, making it possible to add variables to
  -each other. Subtraction can be obtained by adding negative numbers.
  +There are 10 user variables of this type, with names \"n0"\ -- \"n9"\. Their
  +values can be obtained by the normal expansion syntax (for example \$n3$\) in
  +other commands. At the start of filtering, these variables all contain zero.
  +Both arguments of the \"add"\ command are expanded before use, making it
  +possible to add variables to each other. Subtraction can be obtained by adding
  +negative numbers.



   .section The deliver command
  @@ -789,11 +828,16 @@
        deliver <<mail address>>
   e.g. deliver "Dr Livingstone <David@@somewhere.africa.example>"
   .endd
  -This provides a forwarding operation. The message is sent on to the given
  -address, exactly as happens if the address had appeared in a traditional
  -\(.forward)\ file. If you want to deliver the message to a number of different
  -addresses, you can use more than one \"deliver"\ command (each one may have
  -only one address). However, duplicate addresses are discarded.
  +This command provides a forwarding operation. 
  +.em
  +The delivery that it sets up is significant unless the command is preceded by
  +\"unseen"\ (see section ~~SECTsigdel).
  +.nem
  +The message is sent on to the given address, exactly as happens if the address
  +had appeared in a traditional \(.forward)\ file. If you want to deliver the
  +message to a number of different addresses, you can use more than one
  +\"deliver"\ command (each one may have only one address). However, duplicate
  +addresses are discarded.


To deliver a copy of the message to your normal mailbox, your login name can be
given as the address. Once an address has been processed by the filtering
@@ -801,8 +845,8 @@
doing this does not cause a loop.

   However, if you have a mail alias, you should $it{not} refer to it here. For
  -example, if the mail address \"L.Gulliver"\ is aliased to \"lg103"\ then all
  -references in Gulliver's \(.forward)\ file should be to \"lg103"\. A reference
  +example, if the mail address \"L.Gulliver"\ is aliased to \"lg303"\ then all
  +references in Gulliver's \(.forward)\ file should be to \"lg303"\. A reference
   to the alias will not work for messages that are addressed to that alias,
   since, like \(.forward)\ file processing, aliasing is performed only once on an
   address, in order to avoid looping.
  @@ -812,10 +856,10 @@
   the forwarded message will be sent. Instead of going to the message's original
   sender, they go to this new address. For ordinary users, the only value that is
   permitted for this address is the user whose filter file is being processed.
  -For example, the user \"lg103"\ whose mailbox is in the domain
  +For example, the user \"lg303"\ whose mailbox is in the domain
   \lilliput.example\ could have a filter file that contains
   .display asis
  -     deliver jon@??? errors_to lg103@???
  +     deliver jon@??? errors_to lg303@???
   .endd
   Clearly, using this feature makes sense only in situations where not all
   messages are being forwarded. In particular, bounce messages must not be
  @@ -829,10 +873,15 @@
        save <<file name>>
   e.g. save @$home/mail/bookfolder
   .endd
  -This causes a copy of the message to be appended to the given file (that is,
  -the file is used as a mail folder). More than one \"save"\ command may appear;
  -each one causes a copy of the message to be written to its argument file,
  -provided they are different (duplicate \"save"\ commands are ignored).
  +.em
  +This command specifies that a copy of the message is to be appended to the
  +given file (that is, the file is to be used as a mail folder). The delivery
  +that \"save"\ sets up is significant unless the command is preceded by
  +\"unseen"\ (see section ~~SECTsigdel).
  +.nem
  +More than one \"save"\ command may be obeyed; each one causes a copy of the
  +message to be written to its argument file, provided they are different
  +(duplicate \"save"\ commands are ignored).


   If the file name does not start with a / character, the contents of the
   \$home$\ variable are prepended, unless it is empty. In conventional
  @@ -878,10 +927,14 @@
        pipe <<command>>
   e.g. pipe "@$home/bin/countmail @$sender@_address"
   .endd
  -This command sets up delivery to a specified command using a pipe. Remember,
  -however, that no deliveries are done while the filter is being processed. All
  -deliveries happen later on. Therefore, the result of running the pipe is not
  -available to the filter.
  +.em
  +This command specifies that the message is to be delivered to the specified
  +command using a pipe. The delivery that it sets up is significant unless the
  +command is preceded by \"unseen"\ (see section ~~SECTsigdel).
  +.nem
  +Remember, however, that no deliveries are done while the filter is being
  +processed. All deliveries happen later on. Therefore, the result of running the
  +pipe is not available to the filter.


When the deliveries are done, a separate process is run, and a copy of the
message is passed on its standard input. The process runs as the user, under
@@ -981,7 +1034,7 @@
The command should return a zero completion code if all has gone well. Most
non-zero codes are treated by Exim as indicating a failure of the pipe. This is
treated as a delivery failure, causing the message to be returned to its
-sender. However, there are some completion codes which are treated as temporary
+sender. However, there are some completion codes that are treated as temporary
errors. The message remains on Exim's spool disk, and the delivery is tried
again later, though it will ultimately time out if the delivery failures go on
too long. The completion codes to which this applies can be specified by the
@@ -995,16 +1048,17 @@

.section Mail commands
.rset SECTmail "~~chapter.~~section"
-There are two commands which cause the creation of a new mail message, neither
+There are two commands that cause the creation of a new mail message, neither
of which count as a significant delivery unless the command is preceded by the
-word \"seen"\. This is a powerful facility, but it should be used with care,
-because of the danger of creating infinite sequences of messages. The system
-administrator can forbid the use of these commands altogether.
+word \"seen"\ (see section ~~SECTsigdel). This is a powerful facility, but it
+should be used with care, because of the danger of creating infinite sequences
+of messages. The system administrator can forbid the use of these commands
+altogether.

   To help prevent runaway message sequences, these commands have no effect when
  -the incoming message is a delivery error message, and messages sent by this
  -means are treated as if they were reporting delivery errors. Thus they should
  -never themselves cause a delivery error message to be returned. The basic
  +the incoming message is a bounce (delivery error) message, and messages sent by
  +this means are treated as if they were reporting delivery errors. Thus, they
  +should never themselves cause a bounce message to be returned. The basic
   mail-sending command is
   .display
        mail [to <<address-list>>]
  @@ -1026,13 +1080,13 @@


   Each <<address-list>> can contain a number of addresses, separated by commas, 
   in the format of a ::To:: or ::Cc:: header line. In fact, the text you supply 
  -here is copied exactly into the appropriate header line. Thus, it may contain 
  +here is copied exactly into the appropriate header line. It may contain
   additional information as well as email addresses. For example:
   .display asis
   mail to "Julius Caesar <jc@???>, \
            <ma@???> (Mark A.)"
   .endd
  -Similarly, the texts supplied for ::From:: and ::Reply-to:: are copied into 
  +Similarly, the texts supplied for \"from"\ and \"reply@_to"\ are copied into 
   their respective header lines.


As a convenience for use in one common case, there is also a command called
@@ -1059,13 +1113,13 @@
a mailing list manager is an Internet Sin.

For both commands, the key/value argument pairs can appear in any order. At
-least one of \"text"\ or \"file"\ must appear (except with \"vacation"\); if
-both are present, the text string appears first in the message. If \"expand"\
-precedes \"file"\, each line of the file is subject to string expansion as
-it is included in the message.
+least one of \"text"\ or \"file"\ must appear (except with \"vacation"\, where
+there is a default for \"file"\); if both are present, the text string appears
+first in the message. If \"expand"\ precedes \"file"\, each line of the file is
+subject to string expansion before it is included in the message.

Several lines of text can be supplied to \"text"\ by including the escape
-sequence `@\n' in the string where newlines are required. If the command is
+sequence `@\n' in the string wherever a newline is required. If the command is
output during filter file testing, newlines in the text are shown as `@\n'.

Note that the keyword for creating a \"Reply-To:"\ header is \reply@_to\,
@@ -1206,12 +1260,15 @@

.section The headers command
.rset SECTheaders "~~chapter.~~section"
-The \"headers"\ command can be used to change the target character set which is
+The \"headers"\ command can be used to change the target character set that is
used when translating the contents of encoded header lines for insertion by the
\"@$header@_"\ mechanism (see section ~~SECTheadervariables above). The default
can be set in the Exim configuration; if not specified, ISO-8859-1 is used. The
-only currently supported format for the \"headers"\ command is as in this
-example:
+only currently supported format for the \"headers"\ command
+.em
+in user filters
+.nem
+is as in this example:
.display asis
headers charset "UTF-8"
.endd
@@ -1219,6 +1276,13 @@
character set. This particular example would be useful if you wanted to compare
the contents of a header to a UTF-8 string.

+.em
+In system filter files, the \"headers"\ command can be used to add or remove
+header lines from the message. These features are described in the main Exim
+specification.
+.nem
+
+

.section Obeying commands conditionally
.rset SECTif "~~chapter.~~section"
@@ -1258,18 +1322,16 @@

.section String testing conditions
There are a number of conditions that operate on text strings, using the words
-`begins', `ends', `is', `contains' and `matches'.
-
-Note that if you want to apply the same test to more than one header line, you
-can easily concatenate them into a single string for testing, as in this
-example:
+`begins', `ends', `is', `contains' and `matches'. If you want to apply the same
+test to more than one header line, you can easily concatenate them into a
+single string for testing, as in this example:
.display asis
if "$h_to:, $h_cc:" contains me@??? then ...
.endd

  -If any of the condition names are written in lower case, the testing of letters
  -is done without regard to case; if they are written in upper case (for example,
  -`CONTAINS') then the case of letters is significant.
  +If a string-testing condition name is written in lower case, the testing
  +of letters is done without regard to case; if it is written in upper case
  +(for example, `CONTAINS'), the case of letters is taken into account.
   .display
        <<text1>> begins <<text2>>
        <<text1>> does not begin <<text2>>
  @@ -1306,7 +1368,6 @@
   interpreted as a regular expression. Exim uses the PCRE regular expression
   library, which provides regular expressions that are compatible with Perl.


-.em
The match succeeds if the regular expression matches any part of the first
string. If you want a regular expression to match only at the start or end of
the subject string, you must encode that requirement explicitly, using the @^
@@ -1322,7 +1383,6 @@
.display asis
if $sender_address matches "^(bill|john)@" then ...
.endd
-.nem

Care must be taken if you need a backslash in a regular expression, because
backslashes are interpreted as escape characters both by the string expansion
@@ -1357,16 +1417,15 @@
if $sender_address matches "\\N\\.com$\\N"
.endd

-
If the regular expression contains bracketed sub-expressions, numeric
variable substitutions such as \$1$\ can be used in the subsequent actions
after a successful match. If the match fails, the values of the numeric
-variables remain unchanged. Previous values are not restored after \"endif"\ --
-in other words, only one set of values is ever available. If the condition
+variables remain unchanged. Previous values are not restored after \"endif"\.
+In other words, only one set of values is ever available. If the condition
contains several sub-conditions connected by \"and"\ or \"or"\, it is the
strings extracted from the last successful match that are available in
subsequent actions. Numeric variables from any one sub-condition are also
-available for use in subsequent sub-conditions, since string expansion of a
+available for use in subsequent sub-conditions, because string expansion of a
condition occurs just before it is tested.

.section Numeric testing conditions
@@ -1383,112 +1442,22 @@
multiplication by 1024 and 1024x1024 respectively.

.section Testing for significant deliveries
-Whether or not any previously obeyed filter commands have resulted in a
-significant delivery can be tested by the condition \"delivered"\, for example:
+You can use the \"delivered"\ condition to test whether or not any previously
+obeyed filter commands have set up a significant delivery. For example:
.display asis
if not delivered then save mail/anomalous endif
.endd

   .section Testing for error messages
  -The condition \"error@_message"\ is true if the incoming message is a mail
  -delivery error message (bounce message). Putting the command
  +The condition \"error@_message"\ is true if the incoming message is a bounce
  +(mail delivery error) message. Putting the command
   .display asis
   if error_message then finish endif
   .endd
   at the head of your filter file is a useful insurance against things going
  -wrong in such a way that you cannot receive delivery error reports, and is
  -highly recommended. Note that \"error@_message"\ is a condition, not an
  -expansion variable, and therefore is not preceded by \@$\.
  -
  -.section Testing for personal mail
  -.rset SECTpersonal "~~chapter.~~section"
  -A common requirement is to distinguish between incoming personal mail and mail
  -from a mailing list,
  -or from a robot or other automatic process (for example, a bounce message).
  -In particular, this test is normally required for so-called `vacation
  -messages'. The condition
  -.display
  -     personal
  -.endd
  -is a shorthand for
  -.display
  -     not error@_message and
  -     @$header@_to: contains "@$local@_part@@@$domain" and
  -     @$header@_from: does not contain "@$local@_part@@@$domain" and
  -     @$header@_from: does not contain "server@@" and
  -     @$header@_from: does not contain "daemon@@" and
  -     @$header@_from: does not contain "root@@" and
  -     @$header@_auto-submitted: does not contain "auto-" and
  -     @$header@_subject: does not contain "circular" and
  -     @$header@_precedence: does not contain "bulk" and
  -     @$header@_precedence: does not contain "list" and
  -     @$header@_precedence: does not contain "junk"
  -.endd
  -The variable \$local@_part$\ contains the local part of the mail address of
  -the user whose filter file is being run -- it is normally your login id. The
  -\$domain$\ variable contains the mail domain. This condition tests for the
  -appearance of the current user in the \"To:"\ header, checks that the sender is
  -not the current user or one of a number of common daemons, and checks the
  -content of the \"Subject:"\ and \"Precedence:"\ headers.
  -
  -If prefixes or suffixes are in use for local parts -- something which depends
  -on the configuration of Exim (see section ~~SECTmbox below) -- the first two
  -tests above are also done with
  -.display asis
  -$local_part_prefix$local_part$local_part_suffix
  -.endd
  -instead of just \$local@_part$\. If the system is configured to rewrite local
  -parts of mail addresses, for example, to rewrite `dag46' as `Dirk.Gently',
  -the rewritten form of the address is also used in the tests.
  -
  -This example shows the use of \"personal"\ in a filter file that is sending out
  -vacation messages:
  -.display asis
  -if personal then
  -  mail
  -   to $reply_address
  -   subject "Re: $h_subject:"
  -   file $home/vacation/message
  -   once $home/vacation/once
  -   once_repeat 10d
  -endif
  -.endd
  -
  -It is quite common for people who have mail accounts on a number of different
  -systems to forward all their mail to one system, and in this case a check for
  -personal mail should test all their various mail addresses. To allow for this,
  -the \"personal"\ condition keyword can be followed by
  -.display
  -alias <<address>>
  -.endd
  -any number of times, for example
  -.display asis
  -if personal alias smith@???
  -            alias jones@???
  -then ...
  -.endd
  -This causes messages containing the alias addresses in any places where the
  -local address is tested to be treated as personal.
  -
  -.section Testing delivery status
  -There are two conditions which are intended mainly for use in system filter
  -files, but which are available in users' filter files as well. The condition
  -\"first@_delivery"\ is true if this is the first attempt to deliver the
  -message, and false otherwise. 
  -.em
  -This indicator is not reset until the first delivery process successfully 
  -terminates; if there is a crash or a power failure (for example), the next 
  -delivery attempt is also a `first delivery'.
  -.nem
  -
  -In a user filter file it will be false only if
  -there was previously an error in the filter, or if a delivery for the user
  -failed owing to, for example, a quota error, or forwarding to a remote
  -address that was deferred for some reason.
  -
  -The condition \"manually@_thawed"\ is true only if the message was `frozen' for
  -some reason, and was subsequently released by the system administrator. It is
  -unlikely to be of use in users' filter files.
  +wrong in such a way that you cannot receive delivery error reports. \**Note**\:
  +\"error@_message"\ is a condition, not an expansion variable, and therefore is
  +not preceded by \@$\.


.section Testing a list of addresses
There is a facility for looping through a list of addresses and applying a
@@ -1535,6 +1504,130 @@
.endd
scans through the addresses in both the \To:\ and the \Cc:\ headers.

  +.section Testing for personal mail
  +.rset SECTpersonal "~~chapter.~~section"
  +A common requirement is to distinguish between incoming personal mail and mail
  +from a mailing list, or from a robot or other automatic process (for example, a
  +bounce message). In particular, this test is normally required for `vacation
  +messages'.
  +
  +.em
  +The \"personal"\ condition checks that the message is not a bounce message and 
  +that the current user's email address appears in the \"To:"\ header. It also
  +checks that the sender is not the current user or one of a number of common
  +daemons, and that there are no header lines starting \"List-"\ in the message.
  +Finally, it checks the content of the \"Precedence:"\ header line, if there is
  +one.
  +
  +You should always use the \"personal"\ condition when generating automatic
  +responses. 
  +.nem
  +This example shows the use of \"personal"\ in a filter file that is sending out
  +vacation messages:
  +.display asis
  +if personal then
  +  mail
  +   to $reply_address
  +.newline
  +.em    
  +   subject "I am on holiday"
  +.nem
  +.newline    
  +   file $home/vacation/message
  +   once $home/vacation/once
  +   once_repeat 10d
  +endif
  +.endd
  +.em
  +It is tempting, when writing commands like the above, to quote the original
  +subject in the reply. For example:
  +.display asis
  +subject "Re: $h_subject:"
  +.endd
  +There is a danger in doing this, however. It may allow a third party to 
  +subscribe you to an opt-in mailing list, provided that the list accepts bounce 
  +messages as subscription confirmations. (Messages sent from filters are always 
  +sent as bounce messages.) Well-managed lists require a non-bounce message to
  +confirm a subscription, so the danger is relatively small.
  +
  +If prefixes or suffixes are in use for local parts -- something which depends
  +on the configuration of Exim (see section ~~SECTmbox below) -- the tests for
  +the current user are done with the full address (including the prefix and
  +suffix, if any) as well as with the prefix and suffix removed. If the system is
  +configured to rewrite local parts of mail addresses, for example, to rewrite
  +`dag46' as `Dirk.Gently', the rewritten form of the address is also used in the
  +tests.
  +.nem
  +
  +.em
  +.section Alias addresses for the personal condition
  +It is quite common for people who have mail accounts on a number of different
  +systems to forward all their mail to one system, and in this case a check for
  +personal mail should test all their various mail addresses. To allow for this,
  +the \"personal"\ condition keyword can be followed by
  +.display
  +alias <<address>>
  +.endd
  +any number of times, for example
  +.display asis
  +if personal alias smith@???
  +            alias jones@???
  +then ...
  +.endd
  +The alias addresses are treated as alternatives to the current user's email 
  +address when testing the contents of header lines.
  +.nem
  +
  +
  +.em
  +.section Details of the personal condition
  +The basic \"personal"\ test is roughly equivalent to the following:
  +.display flow asis
  +not error_message and
  +$message_headers does not contain "\nList-" and
  +$header_auto-submitted: does not contain "auto-" and
  +$header_precedence: does not contain "bulk" and
  +$header_precedence: does not contain "list" and
  +$header_precedence: does not contain "junk" and
  +foranyaddress $header_to: 
  +  ( $thisaddress contains "$local_part@$domain" ) and
  +not foranyaddress $header_from:
  +  (
  +  $thisaddress contains "$local_part@domain" or
  +  $thisaddress contains "server@" or
  +  $thisaddress contains "daemon@" or
  +  $thisaddress contains "root@" or
  +  $thisaddress contains "listserv@" or
  +  $thisaddress contains "majordomo@" or
  +  $thisaddress contains "-request@" or
  +  $thisaddress matches  "^owner-[^@]+@"       
  +  ) 
  +.endd
  +The variable \$local@_part$\ contains the local part of the mail address of
  +the user whose filter file is being run -- it is normally your login id. The
  +\$domain$\ variable contains the mail domain. As explained above, if aliases 
  +or rewriting are defined, or if prefixes or suffixes are in use, the tests for 
  +the current user are also done with alternative addresses.
  +.nem
  +
  +
  +.section Testing delivery status
  +There are two conditions that are intended mainly for use in system filter
  +files, but which are available in users' filter files as well. The condition
  +\"first@_delivery"\ is true if this is the first process that is attempting to
  +deliver the message, and false otherwise. This indicator is not reset until the
  +first delivery process successfully terminates; if there is a crash or a power
  +failure (for example), the next delivery attempt is also a `first delivery'.
  +
  +In a user filter file \"first@_delivery"\ will be false only if
  +there was previously an error in the filter, or if a delivery for the user
  +failed owing to, for example, a quota error, or if forwarding to a remote
  +address was deferred for some reason.
  +
  +The condition \"manually@_thawed"\ is true only if the message was `frozen' for
  +some reason, and was subsequently released by the system administrator. It is
  +unlikely to be of use in users' filter files.
  +
   .section Multiple personal mailboxes
   .rset SECTmbox "~~chapter.~~section"
   The system administrator can configure Exim so that users can set up variants
  @@ -1543,22 +1636,20 @@
   system, and if so, what the details are.


The facility involves the use of a prefix or a suffix on an email address. For
-example, all mail addressed to \lg103-<<something>>\ would be the property of
-user \lg103\, who could determine how it was to be handled, depending on the
+example, all mail addressed to \lg303-<<something>>\ would be the property of
+user \lg303\, who could determine how it was to be handled, depending on the
value of <<something>>.

There are two possible ways in which this can be set up. The first possibility
-is the use of multiple \(.forward)\ files. In this case, mail to \lg103-foo\,
+is the use of multiple \(.forward)\ files. In this case, mail to \lg303-foo\,
for example, is handled by looking for a file called \.forward-foo\ in
-\lg103's\ home directory. If such a file does not exist, delivery fails and the
+\lg303's\ home directory. If such a file does not exist, delivery fails and the
message is returned to its sender.

The alternative approach is to pass all messages through a single \(.forward)\
-file, which must be a filter file in order to distinguish between the different
-cases by referencing the variables \$local@_part@_prefix$\ or
-\$local@_part@_suffix$\, as in the final example in section ~~SECTex below. If
-the filter file does not handle a prefixed or suffixed address, delivery fails
-and the message is returned to its sender.
+file, which must be a filter file so that it can distinguish between the
+different cases by referencing the variables \$local@_part@_prefix$\ or
+\$local@_part@_suffix$\, as in the final example in section ~~SECTex below.

It is possible to configure Exim to support both schemes at once. In this case,
a specific \.forward-foo\ file is first sought; if it is not found, the basic
@@ -1572,7 +1663,7 @@
As was explained above, filtering just sets up addresses for delivery -- no
deliveries are actually done while a filter file is active. If any of the
generated addresses subsequently suffers a delivery failure, an error message
-is generated in the normal way. However, if the filter command which sets up a
+is generated in the normal way. However, if a filter command that sets up a
delivery is preceded by the word \"noerror"\, errors for that delivery,
$it{and any deliveries consequent on it} (that is, from alias, forwarding, or
filter files it invokes) are ignored.

  Index: spec.src
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-src/spec.src,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- spec.src    7 Oct 2004 15:04:35 -0000    1.1
  +++ spec.src    11 Jan 2005 15:17:51 -0000    1.2
  @@ -1,9 +1,9 @@
  -. $Cambridge: exim/exim-doc/doc-src/spec.src,v 1.1 2004/10/07 15:04:35 ph10 Exp $
  +. $Cambridge: exim/exim-doc/doc-src/spec.src,v 1.2 2005/01/11 15:17:51 ph10 Exp $
   .
  -.set version "4.40"
  -.set previousversion "4.30"
  -.set versionmonth "July"
  -.set versionyear "2004"
  +.set version "4.50"
  +.set previousversion "4.40"
  +.set versionmonth "January"
  +.set versionyear "2005"
   .set ACL "ACL"


. The last of those is to make ACL index entries easier to type. It is put
@@ -181,6 +181,7 @@
.index CRL $it{see certificate revocation list}
.index delivery||failure report $it{see bounce message}
.index dialup $it{see intermittently connected hosts}
+.index exiscan $it{see content scanning}
.index failover $it{see fallback}
.index fallover $it{see fallback}
.index filter||Sieve $it{see Sieve filter}
@@ -192,6 +193,7 @@
.index RBL $it{see DNS list}
.index redirection $it{see address redirection}
.index return path||$it{see also envelope sender}
+.index scanning $it{see content scanning}
.index SSL $it{see TLS}
.index string||expansion $it{see expansion}
.index top bit $it{see 8-bit characters}
@@ -303,9 +305,9 @@
BSD/OS (aka BSDI), Darwin (Mac OS X), DGUX, FreeBSD, GNU/Hurd, GNU/Linux,
HI-OSF (Hitachi), HP-UX, IRIX, MIPS RISCOS, NetBSD, OpenBSD, QNX, SCO, SCO
SVR4.2 (aka UNIX-SV), Solaris (aka SunOS5), SunOS4, Tru64-Unix (formerly
-Digital UNIX, formerly DEC-OSF1), Ultrix, and Unixware. Some of these operating
-systems are no longer current and cannot easily be tested, so the configuration
-files may no longer work in practice.
+Digital UNIX, formerly DEC-OSF1), Ultrix, and Unixware. Some of these operating
+systems are no longer current and cannot easily be tested, so the configuration
+files may no longer work in practice.

There are also configuration files for compiling Exim in the Cygwin environment
that can be installed on systems running Windows. However, this document does
@@ -335,14 +337,12 @@

.section Exim documentation
.index documentation
-.em
This edition of the Exim specification applies to version ~~version of Exim.
Substantive changes from the ~~previousversion edition are marked by bars in
the right-hand margin in the PostScript, PDF, and plain text versions of the
document, and by green text in the HTML version, as shown by this paragraph.
Changes are not marked in the Texinfo version, because Texinfo doesn't support
change bars. Minor corrections and rewordings are not marked.
-.nem

This document is very much a reference manual; it is not a tutorial. The reader
is expected to have some familiarity with the SMTP mail transfer protocol and
@@ -360,7 +360,7 @@
[(A HREF="http://www.uit.co.uk/exim-book/")]
$it{The Exim SMTP Mail Server},
[(/A)]
-published by UIT Cambridge.
+published by UIT Cambridge.
.else
$it{The Exim SMTP Mail Server}, published by UIT Cambridge
(\?http://www.uit.co.uk/exim-book/?\).
@@ -405,7 +405,7 @@
.section FTP and web sites, and mailing list
.index web site
.index FTP site
-The primary distribution site for Exim is an FTP site, whose contents are
+The primary distribution site for Exim is an FTP site, whose contents are
described in \*Where to find the Exim distribution*\ below. In addition,
there is a web site at \?http://www.exim.org?\ by courtesy of Energis Squared,
formerly Planet Online Ltd, who are situated in the UK. The site is mirrored in
@@ -615,8 +615,8 @@
(that is, off Exim's queue) and subsequently passed on to the dial-in hosts by
other means.
.nextp
-Although Exim does have some facilities for scanning incoming messages, these
-are not comprehensive enough to do full virus or spam scanning. Such operations
+Although Exim does have some facilities for scanning incoming messages, these
+are not comprehensive enough to do full virus or spam scanning. Such operations
are best carried out using additional specialized software packages.
.endp

@@ -786,7 +786,7 @@
.index Samba project
.index Microsoft Secure Password Authentication
Client support for Microsoft's \*Secure Password Authentication*\ is provided
-by code contributed by Marc Prud'hommeaux. Server support was contributed by
+by code contributed by Marc Prud'hommeaux. Server support was contributed by
Tom Kistner. This includes code taken from the Samba project, which is released
under the Gnu GPL.

  @@ -848,7 +848,7 @@
   at Carnegie Mellon University (\?http://www.cmu.edu/computing/?\).}
   .newline
   .pop
  -.endp    
  +.endp
   .if ~~sgcal
   .cancelflag $npbracket
   .flag $npbracket "(" ")"
  @@ -944,7 +944,7 @@
   individual recipients or the entire message, respectively, at these two points
   (see chapter ~~CHAPACL). Denial of access results in an SMTP error code.
   .nextp
  -An ACL is also available for locally generated, non-SMTP messages. In this 
  +An ACL is also available for locally generated, non-SMTP messages. In this
   case, the only available actions are to accept or deny the entire message.
   .nextp
   When a message has been received, either from a remote host or from the local
  @@ -961,10 +961,10 @@
   .section User filters
   .index filter||introduction
   .index Sieve filter
  -In a conventional Exim configuration, users are able to run private filters by 
  -setting up appropriate \(.forward)\ files in their home directories. See 
  -chapter ~~CHAPredirect (about the \%redirect%\ router) for the configuration 
  -needed to support this, and the separate document entitled 
  +In a conventional Exim configuration, users are able to run private filters by
  +setting up appropriate \(.forward)\ files in their home directories. See
  +chapter ~~CHAPredirect (about the \%redirect%\ router) for the configuration
  +needed to support this, and the separate document entitled
   .if ~~html
   [(A HREF="filter_toc.html")]
   .fi
  @@ -974,10 +974,10 @@
   .fi
   for user details. Two different kinds of filtering are available:
   .numberpars $.
  -Sieve filters are written in the standard filtering language that is defined by 
  +Sieve filters are written in the standard filtering language that is defined by
   RFC 3028.
   .nextp
  -Exim filters are written in a syntax that is unique to Exim, but which is more 
  +Exim filters are written in a syntax that is unique to Exim, but which is more
   powerful than Sieve, which it pre-dates.
   .endp
   User filters are run as part of the routing process, described below.
  @@ -996,8 +996,8 @@
   characters long. It is divided into three parts, separated by hyphens, for
   example \"16VDhn-0001bo-D3"\. Each part is a sequence of letters and digits,
   normally encoding numbers in base 62. However, in the Darwin operating
  -system (Mac OS X) and when Exim is compiled to run under Cygwin, base 36 
  -(avoiding the use of lower case letters) is used instead, because the message 
  +system (Mac OS X) and when Exim is compiled to run under Cygwin, base 36
  +(avoiding the use of lower case letters) is used instead, because the message
   id is used to construct file names, and the names of files in those systems are
   not case-sensitive.


@@ -1005,8 +1005,8 @@
The detail of the contents of the message id have changed as Exim has evolved.
Earlier versions relied on the operating system not re-using a process id (pid)
within one second. On modern operating systems, this assumption can no longer
-be made, so the algorithm had to be changed. To retain backward compatibility,
-the format of the message id was retained, which is why the following rules are
+be made, so the algorithm had to be changed. To retain backward compatibility,
+the format of the message id was retained, which is why the following rules are
somewhat eccentric:
.numberpars $.
The first six characters of the message id are the time at which the message
@@ -1081,11 +1081,11 @@
users, and the \untrusted@_set@_sender\ option for a way of allowing untrusted
users to change sender addresses.

-Messages received by either of the non-interactive mechanisms are subject to
-checking by the non-SMTP ACL, if one is defined. Messages received using SMTP
-(either over TCP/IP, or interacting with a local process) can be checked by a
-number of ACLs that operate at different times during the SMTP session. Either
-individual recipients, or the entire message, can be rejected if local policy
+Messages received by either of the non-interactive mechanisms are subject to
+checking by the non-SMTP ACL, if one is defined. Messages received using SMTP
+(either over TCP/IP, or interacting with a local process) can be checked by a
+number of ACLs that operate at different times during the SMTP session. Either
+individual recipients, or the entire message, can be rejected if local policy
requirements are not met. The \*local@_scan()*\ function (see chapter
~~CHAPlocalscan) is run for all incoming messages.

@@ -1169,7 +1169,7 @@
are also written to a separate $it{message log} file for each message. These
logs are solely for the benefit of the administrator, and are normally deleted
along with the spool files when processing of a message is complete.
-The use of individual message logs can be disabled by setting
+The use of individual message logs can be disabled by setting
\no@_message@_logs\; this might give an improvement in performance on very
busy systems.

@@ -1203,12 +1203,12 @@
ones are actually used for delivering messages.

.index drivers||instance definition
-Each driver that is specified in the run time configuration is an \*instance*\
-of that particular driver type. Multiple instances are allowed; for example,
-you can set up several different \%smtp%\ transports, each with different
+Each driver that is specified in the run time configuration is an \*instance*\
+of that particular driver type. Multiple instances are allowed; for example,
+you can set up several different \%smtp%\ transports, each with different
option values that might specify different ports or different timeouts. Each
instance has its own identifying name. In what follows we will normally use the
-instance name when discussing one particular instance (that is, one specific
+instance name when discussing one particular instance (that is, one specific
configuration of the driver), and the generic driver name when discussing
the driver's features in general.

@@ -1236,7 +1236,7 @@
.if ~~sys.fancy
.figure "Routing an address" rm
.indent 0
-.call aspic
+.call aspic -sgcal -nv
centre ~~sys.linelength;
magnify 0.8;
boundingbox 30;
@@ -1348,7 +1348,7 @@
The second router does redirection -- also known as aliasing and forwarding.
When it generates one or more new addresses from the original, each of them is
routed independently from the start. Otherwise, the router may cause an address
-to fail, or it may simply decline to handle the address, in which case the
+to fail, or it may simply decline to handle the address, in which case the
address is passed to the next router.

The final router in many configurations is one that checks to see if the
@@ -1362,19 +1362,19 @@
.section Processing an address for verification
.index router||for verification
.index verifying||address, overview
-As well as being used to decide how to deliver to an address, Exim's routers
-are also used for \*address verification*\. Verification can be requested as
-one of the checks to be performed in an ACL for incoming messages, on both
-sender and recipient addresses, and it can be tested using the \-bv-\ and
+As well as being used to decide how to deliver to an address, Exim's routers
+are also used for \*address verification*\. Verification can be requested as
+one of the checks to be performed in an ACL for incoming messages, on both
+sender and recipient addresses, and it can be tested using the \-bv-\ and
\-bvs-\ command line options.

-When an address is being verified, the routers are run in `verify mode'. This
-does not affect the way the routers work, but it is a state that can be
+When an address is being verified, the routers are run in `verify mode'. This
+does not affect the way the routers work, but it is a state that can be
detected. By this means, a router can be skipped or made to behave differently
when verifying. A common example is a configuration in which the first router
sends all messages to a message-scanning program, unless they have been
previously scanned. Thus, the first router accepts all addresses without any
-checking, making it useless for verifying. Normally, the \no@_verify\ option
+checking, making it useless for verifying. Normally, the \no@_verify\ option
would be set for such a router, causing it to be skipped in verify mode.


@@ -1392,7 +1392,7 @@
.numberpars $.
\*accept*\: The router accepts the address, and either queues it for a
transport, or generates one or more `child' addresses. Processing the original
-address ceases,
+address ceases,
.index \unseen\ option
unless the \unseen\ option is set on the router. This option
can be used to set up multiple deliveries with different routing (for example,
@@ -1436,15 +1436,15 @@
.endp
If an address reaches the end of the routers without having been accepted by
any of them, it is bounced as unrouteable.
-The default error message in this situation is `unrouteable address', but you
-can set your own message by making use of the \cannot@_route@_message\ option.
-This can be set for any router; the value from the last router that `saw'
+The default error message in this situation is `unrouteable address', but you
+can set your own message by making use of the \cannot@_route@_message\ option.
+This can be set for any router; the value from the last router that `saw'
the address is used.

Sometimes while routing you want to fail a delivery when some conditions are
met but others are not, instead of passing the address on for further routing.
You can do this by having a second router that explicitly fails the delivery
-when the relevant conditions are met. The \%redirect%\ router has a `fail'
+when the relevant conditions are met. The \%redirect%\ router has a `fail'
facility for this purpose.


@@ -1464,18 +1464,18 @@
removed from the local part before further processing, including the evaluation
of any other conditions.
.nextp
-Routers can be designated for use only when not verifying an address, that is,
-only when routing it for delivery (or testing its delivery routing). If the
-\verify\ option is set false, the router is skipped when Exim is verifying an
+Routers can be designated for use only when not verifying an address, that is,
+only when routing it for delivery (or testing its delivery routing). If the
+\verify\ option is set false, the router is skipped when Exim is verifying an
address.
-Setting the \verify\ option actually sets two options, \verify@_sender\ and
-\verify@_recipient\, which independently control the use of the router for
-sender and recipient verification. You can set these options directly if
+Setting the \verify\ option actually sets two options, \verify@_sender\ and
+\verify@_recipient\, which independently control the use of the router for
+sender and recipient verification. You can set these options directly if
you want a router to be used for only one type of verification.
.nextp
-If the \address@_test\ option is set false, the router is skipped when Exim is
-run with the \-bt-\ option to test an address routing. This can be helpful when
-the first router sends all new messages to a scanner of some sort; it makes it
+If the \address@_test\ option is set false, the router is skipped when Exim is
+run with the \-bt-\ option to test an address routing. This can be helpful when
+the first router sends all new messages to a scanner of some sort; it makes it
possible to use \-bt-\ to test subsequent delivery routing without having to
simulate the effect of the scanner.
.nextp
@@ -1498,14 +1498,14 @@
.nextp
If the \check@_local@_user\ option is set, the local part must be the name of
an account on the local host.
-If this check succeeds, the uid and gid of the local user are placed in
+If this check succeeds, the uid and gid of the local user are placed in
\$local@_user@_uid$\ and \$local@_user@_gid$\; these values can be used in the
remaining preconditions.
.nextp
If the \router@_home@_directory\ option is set, it is expanded at this point,
-because it overrides the value of \$home$\. If this expansion were left till
-later, the value of \$home$\ as set by \check@_local@_user\ would be used in
-subsequent tests. Having two different values of \$home$\ in the same router
+because it overrides the value of \$home$\. If this expansion were left till
+later, the value of \$home$\ as set by \check@_local@_user\ would be used in
+subsequent tests. Having two different values of \$home$\ in the same router
could lead to confusion.
.nextp
If the \senders\ option is set, the envelope sender address must be in the set
@@ -1586,10 +1586,8 @@
to Exim (`the Exim user'), but in this case, several remote deliveries can be
run in parallel. The maximum number of simultaneous remote deliveries for any
one message is set by the \remote@_max@_parallel\ option.
-.em
-The order in which deliveries are done is not defined, except that all local
+The order in which deliveries are done is not defined, except that all local
deliveries happen before any remote deliveries.
-.nem
.nextp
.index queue runner
When it encounters a local delivery during a queue run, Exim checks its retry
@@ -1661,7 +1659,7 @@
If a host is unreachable for a period of time, a number of messages may be
waiting for it by the time it recovers, and sending them in a single SMTP
connection is clearly beneficial. Whenever a delivery to a remote host is
-deferred,
+deferred,
.index hints database
Exim makes a note in its hints database, and whenever a successful
SMTP delivery has happened, it looks to see if any other messages are waiting
@@ -1727,7 +1725,7 @@
.if !~~sys.fancy && ~~sgcal
.tabs 16
.else
-.tabs 22
+.tabs 22
.fi
\(ACKNOWLEDGMENTS)\ $t contains some acknowledgments
.newline
@@ -1861,10 +1859,10 @@
DBMLIB = -ldb
DBMLIB = -ltdb
.endd
-Settings like that will work if the DBM library is installed in the standard
+Settings like that will work if the DBM library is installed in the standard
place. Sometimes it is not, and the library's header file may also not be in
the default path. You may need to set \\INCLUDE\\ to specify where the header
-file is, and to specify the path to the library more fully in \\DBMLIB\\, as in
+file is, and to specify the path to the library more fully in \\DBMLIB\\, as in
this example:
.display asis
INCLUDE=-I/usr/local/include/db-4.1
@@ -1921,11 +1919,11 @@

.section Support for iconv()
.index \*iconv()*\ support
-The contents of header lines in messages may be encoded according to the rules
-described RFC 2047. This makes it possible to transmit characters that are not
-in the ASCII character set, and to label them as being in a particular
-character set. When Exim is inspecting header lines by means of the \@$h@_\
-mechanism, it decodes them, and translates them into a specified character set
+The contents of header lines in messages may be encoded according to the rules
+described RFC 2047. This makes it possible to transmit characters that are not
+in the ASCII character set, and to label them as being in a particular
+character set. When Exim is inspecting header lines by means of the \@$h@_\
+mechanism, it decodes them, and translates them into a specified character set
(default ISO-8859-1). The translation is possible only if the operating system
supports the \*iconv()*\ function.

@@ -1933,10 +1931,10 @@
very many conversions. The GNU \libiconv\ library (available from
\?http:/@/www.gnu.org/software/libiconv/?\) can be installed on such systems to
remedy this deficiency, as well as on systems that do not supply \*iconv()*\ at
-all. After installing \libiconv\, you should add
+all. After installing \libiconv\, you should add
.display asis
-HAVE_ICONV=yes
-.endd
+HAVE_ICONV=yes
+.endd
to your \(Local/Makefile)\ and rebuild Exim.


@@ -1948,11 +1946,11 @@
.index OpenSSL||building Exim with
.index GnuTLS||building Exim with
Exim can be built to support encrypted SMTP connections, using the \\STARTTLS\\
-command as per RFC 2487. It can also support legacy clients that expect to
-start a TLS session immediately on connection to a non-standard port (see the
+command as per RFC 2487. It can also support legacy clients that expect to
+start a TLS session immediately on connection to a non-standard port (see the
\-tls-on-connect-\ command line option).

-If you want to build Exim with TLS support, you must first install either the
+If you want to build Exim with TLS support, you must first install either the
OpenSSL or GnuTLS library. There is no cryptographic code in Exim itself for
implementing SSL.

  @@ -1980,12 +1978,12 @@
   library and include files. For example:
   .display asis
   SUPPORT_TLS=yes
  -USE_GNUTLS=yes        
  +USE_GNUTLS=yes
   TLS_LIBS=-L/usr/gnu/lib -lgnutls -ltasn1 -lgcrypt
   TLS_INCLUDE=-I/usr/gnu/include
   .endd
   You do not need to set \\TLS@_INCLUDE\\ if the relevant directory is already
  -specified in \\INCLUDE\\. Details of how to configure Exim to make use of TLS 
  +specified in \\INCLUDE\\. Details of how to configure Exim to make use of TLS
   are given in chapter ~~CHAPTLS.



@@ -2045,10 +2043,8 @@
.index symbolic link||to source files
Symbolic links to relevant source files are installed in the build directory.

-.em
-\**Warning**\: The \-j-\ (parallel) flag must not be used with \*make*\; the
+\**Warning**\: The \-j-\ (parallel) flag must not be used with \*make*\; the
building process fails if it is set.
-.nem

If this is the first time \*make*\ has been run, it calls a script that builds
a make file inside the build directory, using the configuration files from the
@@ -2118,22 +2114,22 @@

.index building Exim||overriding default settings
If you need to change any of the values that are set in \(OS/Makefile-Default)\
-or in \(OS/Makefile-<<ostype>>)\, or to add any new definitions, you do not
+or in \(OS/Makefile-<<ostype>>)\, or to add any new definitions, you do not
need to change the original files. Instead, you should make the changes by
putting the new values in an appropriate \(Local)\ file. For example,
.index Tru64-Unix build-time settings
when building Exim in many releases of the Tru64-Unix (formerly Digital UNIX,
formerly DEC-OSF1) operating system, it is necessary to specify that the C
-compiler is called \*cc*\ rather than \*gcc*\. Also, the compiler must be
+compiler is called \*cc*\ rather than \*gcc*\. Also, the compiler must be
called with the option \-std1-\, to make it recognize some of the features of
-Standard C that Exim uses. (Most other compilers recognize Standard C by
+Standard C that Exim uses. (Most other compilers recognize Standard C by
default.) To do this, you should create a file called \(Local/Makefile-OSF1)\
containing the lines
.display
CC=cc
CFLAGS=-std1
.endd
-If you are compiling for just one operating system, it may be easier to put
+If you are compiling for just one operating system, it may be easier to put
these lines directly into \(Local/Makefile)\.

Keeping all your local configuration settings separate from the distributed
@@ -2256,7 +2252,7 @@
The command \*make install*\ runs the \*exim@_install*\ script with no
arguments. The script copies binaries and utility scripts into the directory
whose name is specified by the \\BIN@_DIRECTORY\\ setting in
-\(Local/Makefile)\.
+\(Local/Makefile)\.

Exim's run time configuration file is named by the \\CONFIGURE@_FILE\\ setting
.index \\CONFIGURE@_FILE\\
@@ -2304,10 +2300,10 @@
.display asis
make DESTDIR=/some/directory/ install
.endd
-This has the effect of pre-pending the specified directory to all the file
-paths, except the name of the system aliases file that appears in the default
+This has the effect of pre-pending the specified directory to all the file
+paths, except the name of the system aliases file that appears in the default
configuration. (If a default alias file is created, its name \*is*\ modified.)
-For backwards compatibility, \\ROOT\\ is used if \\DESTDIR\\ is not set,
+For backwards compatibility, \\ROOT\\ is used if \\DESTDIR\\ is not set,
but this usage is deprecated.

.index installing Exim||what is not installed
@@ -2355,8 +2351,8 @@
make INSTALL_ARG=-no_symlink install
.endd

-The installation script can also be given arguments specifying which files are
-to be copied. For example, to install just the Exim binary, and nothing else,
+The installation script can also be given arguments specifying which files are
+to be copied. For example, to install just the Exim binary, and nothing else,
without creating the symbolic link, you could use:
.display asis
make INSTALL_ARG='-no_symlink exim' install
@@ -2395,7 +2391,7 @@
.endd
If there are any errors in the configuration file, Exim outputs error messages.
Otherwise it outputs the version number and build date,
-the DBM library that is being used, and information about which drivers and
+the DBM library that is being used, and information about which drivers and
other optional code modules are included in the binary.
Some simple routing tests can be done by using the address testing option. For
example,
@@ -2538,8 +2534,8 @@
.endd
to obtain the daemon's pid directly from the file that Exim saves it in.

-Note, however, that stopping the daemon does not `stop Exim'. Messages can
-still be received from local processes, and if automatic delivery is configured
+Note, however, that stopping the daemon does not `stop Exim'. Messages can
+still be received from local processes, and if automatic delivery is configured
(the normal case), deliveries will still occur.


@@ -2564,8 +2560,8 @@
.section Setting options by program name
.index \*mailq*\
If Exim is called under the name \*mailq*\, it behaves as if the option \-bp-\
-were present before any other options.
-The \-bp-\ option requests a listing of the contents of the mail queue on the
+were present before any other options.
+The \-bp-\ option requests a listing of the contents of the mail queue on the
standard output.
This feature is for compatibility with some systems that contain a command of
that name in one of the standard libraries, symbolically linked to
@@ -2653,9 +2649,9 @@
false.
.endp

-\**Warning**\: If you configure your system so that admin users are able to
-edit Exim's configuration file, you are giving those users an easy way of
-getting root. There is further discussion of this issue at the start of chapter
+\**Warning**\: If you configure your system so that admin users are able to
+edit Exim's configuration file, you are giving those users an easy way of
+getting root. There is further discussion of this issue at the start of chapter
~~CHAPconf.


@@ -2673,7 +2669,7 @@

.option -help
This option causes Exim to output a few sentences stating what it is.
-The same output is generated if the Exim binary is called with no options and
+The same output is generated if the Exim binary is called with no options and
no arguments.

.option B <<type>>
@@ -2715,7 +2711,7 @@
.index \\SIGHUP\\
The \\SIGHUP\\ signal can be used to cause the daemon to re-exec itself. This
should be done whenever Exim's configuration file, or any file that is
-incorporated into it by means of the \.include\ facility, is changed, and also
+incorporated into it by means of the \.include\ facility, is changed, and also
whenever a new version of Exim is installed. It is not necessary to do this
when other files that are referenced from the configuration (for example, alias
files) are changed, because these are reread each time they are used.
@@ -2731,7 +2727,7 @@
prevent ordinary users from using this mode to read otherwise inaccessible
files. If no arguments are given, Exim runs interactively, prompting for lines
of data. Long expressions can be split over several lines by using backslash
-continuations.
+continuations.
As in Exim's run time configuration, whitespace at the start of continuation
lines is ignored.

@@ -2757,14 +2753,14 @@
tested, and a test message must be supplied on the standard input. If there are
no message-dependent tests in the filter, an empty file can be supplied. If a
system filter file is being tested, \-bF-\ should be used instead of \-bf-\. If
-the test file does not begin with
+the test file does not begin with
one of the special lines
.display asis
# Exim filter
# Sieve filter
.endd
it is taken to be a normal \(.forward)\ file, and is tested for validity under
-that interpretation. See sections ~~SECTitenonfilred to ~~SECTspecitredli for a
+that interpretation. See sections ~~SECTitenonfilred to ~~SECTspecitredli for a
description of the possible contents of non-filter redirection lists.

The result of an Exim command that uses \-bf-\, provided no errors are
@@ -2811,8 +2807,8 @@
.endd
Comments as to what is going on are written to the standard error file. These
include lines beginning with `LOG' for anything that would have been logged.
-This facility is provided for testing configuration options for incoming
-messages, to make sure they implement the required policy. For example, you can
+This facility is provided for testing configuration options for incoming
+messages, to make sure they implement the required policy. For example, you can
test your relay controls using \-bh-\.

.index RFC 1413
@@ -2821,7 +2817,7 @@
\-bh-\ because there is no incoming SMTP connection.

\**Warning 2**\: Address verification callouts (see section ~~SECTcallver) are
-also skipped when testing using \-bh-\. If you want these callouts to occur,
+also skipped when testing using \-bh-\. If you want these callouts to occur,
use \-bhc-\ instead.

Messages supplied during the testing session are discarded, and nothing is
@@ -2834,9 +2830,9 @@
acceptable or not. See section ~~SECTcheckaccess.

.option bhc #<<IP address>>
-This option operates in the same way as \-bh-\, except that address
-verification callouts are performed if required. This includes consulting and
-updating the callout cache database.
+This option operates in the same way as \-bh-\, except that address
+verification callouts are performed if required. This includes consulting and
+updating the callout cache database.

.option bi
.index alias file||building
@@ -2870,7 +2866,7 @@
options, as appropriate. The \-bnq-\ option (see below) provides a way of
suppressing this for special cases.

-Policy checks on the contents of local messages can be enforced by means of the
+Policy checks on the contents of local messages can be enforced by means of the
non-SMTP ACL. See chapter ~~CHAPACL for details.
.index return code||for \-bm-\
The return code is zero if the message is successfully accepted. Otherwise, the
@@ -2891,7 +2887,7 @@
is permitted to appear at the start of the message. There appears to be no
authoritative specification of the format of this line. Exim recognizes it by
matching against the regular expression defined by the \uucp@_from@_pattern\
-option, which can be changed if necessary.
+option, which can be changed if necessary.
.index \-f-\ option||overriding `From' line
The specified sender is treated as if it were given as the argument to the
\-f-\ option, but if a \-f-\ option is also present, its argument is used in
@@ -2903,8 +2899,8 @@
By default, Exim automatically qualifies unqualified addresses (those
without domains) that appear in messages that are submitted locally (that
is, not over TCP/IP). This qualification applies both to addresses in
-envelopes, and addresses in header lines. Sender addresses are qualified using
-\qualify@_domain\, and recipient addresses using \qualify@_recipient\ (which
+envelopes, and addresses in header lines. Sender addresses are qualified using
+\qualify@_domain\, and recipient addresses using \qualify@_recipient\ (which
defaults to the value of \qualify@_domain\).

Sometimes, qualification is not wanted. For example, if \-bS-\ (batch SMTP) is
@@ -2937,7 +2933,7 @@
.endd
If \configure@_file\ is given as an argument, the name of the run time
configuration file is output.
-If a list of configuration files was supplied, the value that is output here
+If a list of configuration files was supplied, the value that is output here
is the name of the file that was actually used.

.index daemon||process id (pid)
@@ -3107,7 +3103,7 @@
.index local SMTP input
This option causes Exim to accept one or more messages by reading SMTP commands
on the standard input, and producing SMTP replies on the standard output. SMTP
-policy controls, as defined in ACLs (see chapter ~~CHAPACL) are applied.
+policy controls, as defined in ACLs (see chapter ~~CHAPACL) are applied.

Some user agents use this interface as a way of passing locally-generated
messages to the MTA.
@@ -3122,10 +3118,10 @@
.index inetd
The \-bs-\ option is also used to run Exim from \*inetd*\, as an alternative to
using a listening daemon. Exim can distinguish the two cases by checking
-whether the standard input is a TCP/IP socket. When Exim is called from
-\*inetd*\, the source of the mail is assumed to be remote, and the comments
-above concerning senders and qualification do not apply. In this situation,
-Exim behaves in exactly the same way as it does when receiving a message via
+whether the standard input is a TCP/IP socket. When Exim is called from
+\*inetd*\, the source of the mail is assumed to be remote, and the comments
+above concerning senders and qualification do not apply. In this situation,
+Exim behaves in exactly the same way as it does when receiving a message via
the listening daemon.

.option bt
@@ -3133,16 +3129,16 @@
.index address||testing
This option runs Exim in address testing mode, in which each argument is taken
as an address to be tested for deliverability. The results are written to the
-standard output.
-If a test fails, and the caller is not an admin user, no details of the
-failure are output, because these might contain sensitive information such as
+standard output.
+If a test fails, and the caller is not an admin user, no details of the
+failure are output, because these might contain sensitive information such as
usernames and passwords for database lookups.

If no arguments are given, Exim runs in an interactive manner, prompting with a
right angle bracket for addresses to be tested. Each address is handled as if
it were the recipient address of a message (compare the \-bv-\ option). It is
passed to the routers and the result is written to the standard output.
-However, any router that has \no@_address@_test\ set is bypassed. This can
+However, any router that has \no@_address@_test\ set is bypassed. This can
make \-bt-\ easier to use for genuine routing tests if your first router passes
everything to a scanner program.

@@ -3153,7 +3149,7 @@

\**Warning**\: \-bt-\ can only do relatively simple testing. If any of the
routers in the configuration makes any tests on the sender address of a
-message,
+message,
.index \-f-\ option||for address testing
you can use the \-f-\ option to set an appropriate sender when running
\-bt-\ tests. Without it, the sender is assumed to be the calling user at the
@@ -3235,7 +3231,7 @@
the caller is root. The reception works, but by that time, Exim is running as
the Exim user, so when it re-execs to regain privilege for the delivery, the
use of \-C-\ causes privilege to be lost. However, root can test reception and
-delivery using two separate commands (one to put a message on the queue, using
+delivery using two separate commands (one to put a message on the queue, using
\-odq-\, and another to do the delivery, using \-M-\).

If \\ALT@_CONFIG@_PREFIX\\ is defined \(in Local/Makefile)\, it specifies a
@@ -3243,7 +3239,7 @@
must start. In addition, the file name must not contain the sequence \"/../"\.
However, if the value of the \-C-\ option is identical to the value of
\\CONFIGURE@_FILE\\ in \(Local/Makefile)\, Exim ignores \-C-\ and proceeds as
-usual. There is no default setting for \\ALT@_CONFIG@_PREFIX\\; when it is
+usual. There is no default setting for \\ALT@_CONFIG@_PREFIX\\; when it is
unset, any file name can be used with \-C-\.

\\ALT@_CONFIG@_PREFIX\\ can be used to confine alternative configuration files
@@ -3261,20 +3257,20 @@
.index macro||setting on command line
This option can be used to override macro definitions in the configuration file
(see section ~~SECTmacrodefs). However, like \-C-\, if it is used by an
-unprivileged caller, it causes Exim to give up its root privilege.
+unprivileged caller, it causes Exim to give up its root privilege.
If \\DISABLE@_D@_OPTION\\ is defined in \(Local/Makefile)\, the use of \-D-\ is
completely disabled, and its use causes an immediate error exit.

   The entire option (including equals sign if present) must all be within one
  -command line item. \-D-\ can be used to set the value of a macro to the empty 
  -string, in which case the equals sign is optional. These two commands are 
  +command line item. \-D-\ can be used to set the value of a macro to the empty
  +string, in which case the equals sign is optional. These two commands are
   synonymous:
   .display asis
   exim -DABC  ...
   exim -DABC= ...
   .endd
  -To include spaces in a macro definition item, quotes must be used. If you use 
  -quotes, spaces are permitted around the macro name and the equals sign. For 
  +To include spaces in a macro definition item, quotes must be used. If you use
  +quotes, spaces are permitted around the macro name and the equals sign. For
   example:
   .display asis
   exim '-D ABC = something' ...
  @@ -3315,7 +3311,7 @@
   interface     $t $rm{lists of local interfaces}
   lists         $t $rm{matching things in lists}
   load          $t $rm{system load checks}
  -local@_scan    $t $rm{can be used by \*local@_scan()*\ (see chapter ~~CHAPlocalscan)} 
  +local@_scan    $t $rm{can be used by \*local@_scan()*\ (see chapter ~~CHAPlocalscan)}
   lookup        $t $rm{general lookup code and all lookups}
   memory        $t $rm{memory handling}
   pid           $t $rm{add pid to debug output lines}
  @@ -3334,14 +3330,12 @@


   all           $t $rm{all of the above, and also \-v-\}
   .endd
  -.em
   .index resolver, debugging output
   .index DNS||resolver, debugging output
  -The \"resolver"\ option produces output only if the DNS resolver was compiled 
  +The \"resolver"\ option produces output only if the DNS resolver was compiled
   with \\DEBUG\\ enabled. This is not the case in some operating systems. Also,
   unfortunately, debugging output from the DNS resolver is written to stdout
   rather than stderr.
  -.nem


The default (\-d-\ with no argument) omits \"expand"\, \"filter"\,
\"interface"\, \"load"\, \"memory"\, \"pid"\, \"resolver"\, and \"timestamp"\.
@@ -3358,8 +3352,8 @@
any debugging is selected, or if \-v-\ is used.

.option dropcr
-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
+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 ~~SECTlineendings.


@@ -3401,10 +3395,10 @@
use it, the sender of a local message is set to the caller's login name at the
default qualify domain.

-There is one exception to the restriction on the use of \-f-\: an empty sender
+There is one exception to the restriction on the use of \-f-\: an empty sender
can be specified by any user, to create a message that can never provoke a
bounce. An empty sender can be specified either as an empty string, or as a
-pair of angle brackets with nothing between them, as in these examples of shell
+pair of angle brackets with nothing between them, as in these examples of shell
commands:
.display asis
exim -f '<>' user@domain
@@ -3451,7 +3445,7 @@
This option requests Exim to run a delivery attempt on each message in turn. If
any of the messages are frozen, they are automatically thawed before the
delivery attempt. The settings of \queue@_domains\, \queue@_smtp@_domains\, and
-\hold@_domains\ are ignored.
+\hold@_domains\ are ignored.
.index hints database||overriding retry hints
Retry hints for any of the addresses are
overridden -- Exim tries to deliver even if the normal retry time has not yet
@@ -3486,8 +3480,8 @@
to the remote host has been authenticated.

.option MCP
-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 server to
+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 server to
which Exim is connected supports pipelining.

.option MCQ #<<process id>> <<pipe fd>>
@@ -3550,7 +3544,7 @@
.index delivery||abandoning further attempts
This option requests Exim to give up trying to deliver the listed messages,
including any that are frozen. However, if any of the messages are active,
-their status is not altered.
+their status is not altered.
For non-bounce messages, a delivery error message is sent to the sender,
containing the text `cancelled by administrator'. Bounce messages are just
discarded.
@@ -3642,7 +3636,7 @@
Exim.

.option O #<<data>>
-This option is interpreted by Sendmail to mean `set option`. It is ignored by
+This option is interpreted by Sendmail to mean `set option`. It is ignored by
Exim.

.option oA #<<file name>>
@@ -3667,7 +3661,7 @@
messages, which means that the accepting process automatically starts delivery
process for each message received, but does not wait for the delivery process
to complete. This is the default action if none of the \-od-\ options are
-present.
+present.

If one of the queueing options in the configuration file
(\queue@_only\ or \queue@_only@_file\, for example) is in effect, \-odb-\
@@ -3681,7 +3675,7 @@
a locally-generated message. (For the daemon it is exactly the same as
\-odb-\.) A delivery process is automatically started to deliver the
message, and Exim waits for it to complete before proceeding.
-However, like \-odb-\, this option has no effect if \queue@_only@_override\ is
+However, like \-odb-\, this option has no effect if \queue@_only@_override\ is
false and one of the queueing options in the configuration file is in effect.

.option odi
@@ -3703,7 +3697,7 @@

.option odqs
.index SMTP||delaying delivery
-This option is a hybrid between \-odb-\/\-odi-\ and \-odq-\.
+This option is a hybrid between \-odb-\/\-odi-\ and \-odq-\.
However, like \-odb-\ and \-odi-\, this option has no effect if
\queue@_only@_override\ is false and one of the queueing options in the
configuration file is in effect.
@@ -3758,10 +3752,8 @@
.index dot||in incoming, non-SMTP message
This option, which has the same effect as \-i-\, specifies that a dot on a line
by itself should not terminate an incoming, non-SMTP message.
-.em
-Otherwise, a single dot does terminate, though Exim does no special processing
+Otherwise, a single dot does terminate, though Exim does no special processing
for other lines that start with a dot.
-.nem
This option is set by default if Exim is called as \*rmail*\. See also \-ti-\.

.option oitrue
@@ -3772,7 +3764,7 @@
A number of options starting with \-oM-\ can be used to set values associated
with remote hosts on locally-submitted messages (that is, messages not received
over TCP/IP). These options can be used by any caller in conjunction with the
-\-bh-\,
+\-bh-\,
\-be-\,
\-bf-\, \-bF-\, \-bt-\, or \-bv-\ testing options. In other circumstances, they
are ignored unless the caller is trusted.
@@ -3799,7 +3791,7 @@
.option oMai #<<string>>
.index authentication||id, specifying for local message
See \-oMa-\ above for general remarks about the \-oM-\ options. The \-oMai-\
-option sets the
+option sets the
value of \$authenticated@_id$\ (the id that was authenticated).
This overrides the default value (the caller's login id) for messages from
local sources. See chapter ~~CHAPSMTPAUTH for a discussion of authenticated
@@ -3809,7 +3801,7 @@
.index authentication||sender, specifying for local message
See \-oMa-\ above for general remarks about the \-oM-\ options. The \-oMas-\
option sets the authenticated sender value
-in \$authenticated@_sender$\.
+in \$authenticated@_sender$\.
It overrides the sender address that is created from the caller's login id for
messages from local sources. See chapter ~~CHAPSMTPAUTH for a discussion of
authenticated senders.
@@ -3819,14 +3811,14 @@
See \-oMa-\ above for general remarks about the \-oM-\ options. The \-oMi-\
option sets the IP interface address value. A port number may be included,
using the same syntax as for \-oMa-\.
-The interface address is placed in \$interface@_address$\ and the port number,
+The interface address is placed in \$interface@_address$\ and the port number,
if present, in \$interface@_port$\.

.option oMr #<<protocol name>>
.index protocol||incoming, specifying for local message
See \-oMa-\ above for general remarks about the \-oM-\ options. The \-oMr-\
option sets the received protocol value
-in \$received@_protocol$\.
+in \$received@_protocol$\.
However, this applies only when \-bs-\ is not used. For interactive SMTP input,
the protocol is determined by whether \\EHLO\\ or \\HELO\\ is used, and is
always either `local-esmtp' or `local-smtp'. For \-bS-\ (batch SMTP) however,
@@ -3835,15 +3827,15 @@
.option oMs #<<host name>>
.index sender||host name, specifying for local message
See \-oMa-\ above for general remarks about the \-oM-\ options. The \-oMs-\
-option sets the sender host name
-in \$sender@_host@_name$\. When this option is present, Exim does not attempt
+option sets the sender host name
+in \$sender@_host@_name$\. When this option is present, Exim does not attempt
to look up a host name from an IP address; it uses the name it is given.

.option oMt #<<ident string>>
.index sender||ident string, specifying for local message
See \-oMa-\ above for general remarks about the \-oM-\ options. The \-oMt-\
option sets the sender ident value
-in \$sender@_ident$\.
+in \$sender@_ident$\.
The default setting for local callers is the login id of the calling process.

.option om
@@ -3860,7 +3852,7 @@
.option oP #<<path>>
.index pid (process id)||of daemon
.index daemon||process id (pid)
-This option is useful only in conjunction with \-bd-\ or \-q-\ with a time
+This option is useful only in conjunction with \-bd-\ or \-q-\ with a time
value. The option specifies the file to which the process id of the daemon is
written. When \-oX-\ is used with \-bd-\, or when \-q-\ with a time is used
without \-bd-\, this is the only way of causing Exim to write a pid file,
@@ -3906,11 +3898,10 @@
chapter ~~CHAPperl). It overrides the setting of the \perl@_at@_start\ option,
forcing the starting of the interpreter to occur as soon as Exim is started.

-.em
.option p<<rval>>:<<sval>>
For compatibility with Sendmail, this option
is equivalent to
-.display
+.display
-oMr <<rval>> -oMs <<sval>>
.endd
It sets the incoming protocol and host name (for trusted callers). The
@@ -3918,7 +3909,6 @@
Note the Exim already has two private options, \-pd-\ and \-ps-\, that refer to
embedded Perl. It is therefore impossible to set a protocol value of \"p"\ or
\"s"\ using this option (but that does not seem a real limitation).
-.nem

.option q
.index queue runner||starting manually
@@ -3966,7 +3956,7 @@
An option starting with \-qq-\ requests a two-stage queue run. In the first
stage, the queue is scanned as if the \queue@_smtp@_domains\ option matched
every domain. Addresses are routed, local deliveries happen, but no remote
-transports are run.
+transports are run.
.index hints database||remembering routing
The hints database that remembers which messages are
waiting for specific hosts is updated, as if delivery to those hosts had been
@@ -3988,7 +3978,7 @@
\-odq-\ and want a queue runner just to process the new messages.

.option q[q][i]f...
-.index queue||forcing delivery
+.index queue||forcing delivery
.index delivery||forcing in queue run
If one \*f*\ flag is present, a delivery attempt is forced for each non-frozen
message, whereas without \f\ only those non-frozen addresses that have passed
@@ -4041,7 +4031,7 @@
Such a daemon listens for incoming SMTP calls, and also starts a queue runner
process every 30 minutes.

-When a daemon is started by \-q-\ with a time value, but without \-bd-\, no pid
+When a daemon is started by \-q-\ with a time value, but without \-bd-\, no pid
file is written unless one is explicitly requested by the \-oP-\ option.

.option qR <<rsflags>>#<<string>>
@@ -4098,13 +4088,11 @@
conditions must be met for a message to be selected. If either of the options
has \*f*\ or \*ff*\ in its flags, the associated action is taken.

  -.em
   .option Tqt#<<times>>
   This an option that is exclusively for use by the Exim testing suite.
   It is not recognized when Exim is run normally. It allows for the setting up
  -of explicit `queue times' so that various warning/retry features can be 
  -tested. 
  -.nem                                           
  +of explicit `queue times' so that various warning/retry features can be
  +tested.


.option t
.index recipient||extracting from header lines
@@ -4135,10 +4123,10 @@
the requirement has been removed in RFC 2822, but that is still very new.

.index \Resent@-\ header lines||with \-t-\
-If there are any \Resent@-\ header lines in the message, Exim extracts
+If there are any \Resent@-\ header lines in the message, Exim extracts
recipients from all ::Resent-To::, ::Resent-Cc::, and ::Resent-Bcc:: header
-lines instead of from ::To::, ::Cc::, and ::Bcc::. This is for compatibility
-with Sendmail and other MTAs. (Prior to release 4.20, Exim gave an error if
+lines instead of from ::To::, ::Cc::, and ::Bcc::. This is for compatibility
+with Sendmail and other MTAs. (Prior to release 4.20, Exim gave an error if
\-t-\ was used in conjunction with \Resent@-\ header lines.)

RFC 2822 talks about different sets of \Resent@-\ header lines (for when a
@@ -4152,7 +4140,7 @@
\X-Resent@-\ when a new set is added. This removes any possible ambiguity.

.option ti
-This option is exactly equivalent to \-t-\ \-i-\. It is provided for
+This option is exactly equivalent to \-t-\ \-i-\. It is provided for
compatibility with Sendmail.

.option tls-on-connect
@@ -4210,7 +4198,7 @@
.index \\CONFIGURE@_FILE\\
Exim uses a single run time configuration file that is read whenever an Exim
binary is executed. Note that in normal operation, this happens frequently,
-because Exim is designed to operate in a distributed manner, without central
+because Exim is designed to operate in a distributed manner, without central
control.

The name of the configuration file is compiled into the binary for security
@@ -4224,23 +4212,21 @@
.index configuration file||ownership
.index ownership||configuration file
The run time configuration file must be owned by root or by the user that
-is specified at compile time by the \\EXIM@_USER\\ option,
-.em
-or by the user that is specified at compile time by the \\CONFIGURE@_OWNER\\
+is specified at compile time by the \\EXIM@_USER\\ option,
+or by the user that is specified at compile time by the \\CONFIGURE@_OWNER\\
option (if set).
-.nem
The configuration file must not be world-writeable or group-writeable, unless
its group is the one specified at compile time by the \\EXIM@_GROUP\\ option.

-\**Warning**\: In a conventional configuration, where the Exim binary is setuid
-to root, anybody who is able to edit the run time configuration file has an
-easy way to run commands as root. If you make your mail administrators members
-of the Exim group, but do not trust them with root, make sure that the run time
+\**Warning**\: In a conventional configuration, where the Exim binary is setuid
+to root, anybody who is able to edit the run time configuration file has an
+easy way to run commands as root. If you make your mail administrators members
+of the Exim group, but do not trust them with root, make sure that the run time
configuration is not group writeable.


A default configuration file, which will work correctly in simple situations,
-is provided in the file \(src/configure.default)\.
+is provided in the file \(src/configure.default)\.
If \\CONFIGURE@_FILE\\ defines just one file name, the installation process
copies the default configuration to a new file of that name if it did not
previously exist. If \\CONFIGURE@_FILE\\ is a list, no default is automatically
@@ -4260,7 +4246,7 @@
A one-off alternate configuration can be specified by the \-C-\ command line
option, which may specify a single file or a list of files. However, when \-C-\
is used, Exim gives up its root privilege, unless called by root or the Exim
-user (or unless the argument for \-C-\ is identical to the built-in value from
+user (or unless the argument for \-C-\ is identical to the built-in value from
\\CONFIGURE@_FILE\\). \-C-\ is useful mainly for checking the syntax of
configuration files before installing them. No owner or group checks are done
on a configuration file specified by \-C-\.
@@ -4272,7 +4258,7 @@
the caller is root. The reception works, but by that time, Exim is running as
the Exim user, so when it re-execs to regain privilege for the delivery, the
use of \-C-\ causes privilege to be lost. However, root can test reception and
-delivery using two separate commands (one to put a message on the queue, using
+delivery using two separate commands (one to put a message on the queue, using
\-odq-\, and another to do the delivery, using \-M-\).

If \\ALT@_CONFIG@_PREFIX\\ is defined \(in Local/Makefile)\, it specifies a
@@ -4282,7 +4268,7 @@
name can be used with \-C-\.

One-off changes to a configuration can be specified by the \-D-\ command line
-option, which defines and overrides values for macros used inside the
+option, which defines and overrides values for macros used inside the
configuration file. However, like \-C-\, the use of this option by a
non-privileged user causes Exim to discard its root privilege.
If \\DISABLE@_D@_OPTION\\ is defined in \(Local/Makefile)\, the use of \-D-\ is
@@ -4293,7 +4279,7 @@
If \\CONFIGURE@_FILE@_USE@_NODE\\ is defined in \(Local/Makefile)\, Exim first
looks for a file whose name is the configuration file name followed by a dot
and the machine's node name, as obtained from the \*uname()*\ function. If this
-file does not exist, the standard name is tried. This processing occurs for
+file does not exist, the standard name is tried. This processing occurs for
each file name in the list given by \\CONFIGURE@_FILE\\ or \-C-\.

In some esoteric situations different versions of Exim may be run under
@@ -4334,7 +4320,7 @@
.display asis
LOCAL_SCAN_HAS_OPTIONS=yes
.endd
-in \(Local/Makefile)\ before building Exim. Full details of the
+in \(Local/Makefile)\ before building Exim. Full details of the
\*local@_scan()*\ facility are given in chapter ~~CHAPlocalscan.
.endp
Blank lines in the file, and lines starting with a @# character (ignoring
@@ -4344,7 +4330,7 @@

Any non-comment line can be continued by ending it with a backslash. Trailing
white space after the backslash is ignored, and leading white space at the
-start of continuation lines is also ignored.
+start of continuation lines is also ignored.
Comment lines beginning with @# (but not empty lines) may appear in the middle
of a sequence of continuation lines.

@@ -4373,8 +4359,8 @@
.display
@.include@_if@_exists <<file name>>
.endd
-on a line by itself. Double quotes round the file name are optional. If you use
-the first form, a configuration error occurs if the file does not exist; the
+on a line by itself. Double quotes round the file name are optional. If you use
+the first form, a configuration error occurs if the file does not exist; the
second form does nothing for non-existent files.

   Includes may be nested to any depth, but remember that Exim reads its
  @@ -4389,8 +4375,8 @@
   hosts_lookup = a.b.c \
                  .include /some/file
   .endd
  -Include processing happens 
  -after 
  +Include processing happens
  +after
   macro processing (see below). Its effect is to process the lines of the file as
   if they occurred inline where the inclusion appears.


@@ -4455,9 +4441,9 @@
.index configuration file||conditional skips
.index .ifdef
You can use the directives \".ifdef"\, \".ifndef"\, \".elifdef"\,
-\".elifndef"\, \".else"\, and \".endif"\ to dynamically include or exclude
-portions of the configuration file. The processing happens whenever the file is
-read (that is, when an Exim binary starts to run).
+\".elifndef"\, \".else"\, and \".endif"\ to dynamically include or exclude
+portions of the configuration file. The processing happens whenever the file is
+read (that is, when an Exim binary starts to run).

The implementation is very simple. Instances of the first four directives must
be followed by text that includes the names of one or macros. The condition
@@ -4546,7 +4532,7 @@
is multiplied by 1024x1024.

When the values of integer option settings are output, values which are an
-exact multiple of 1024 or 1024x1024 are
+exact multiple of 1024 or 1024x1024 are
sometimes, but not always,
printed using the letters K and M. The printing style is independent of the
actual input format that was used.
@@ -4582,7 +4568,7 @@
.endd
For example, `3h50m' specifies 3 hours and 50 minutes. The values of time
intervals are output in the same format.
-Exim does not restrict the values; it is perfectly acceptable, for example, to
+Exim does not restrict the values; it is perfectly acceptable, for example, to
specify `90m' instead of `1h30m'.


@@ -4655,10 +4641,10 @@
.index format||list item in configuration
.index string list, definition
.rset SECTlistconstruct "~~chapter.~~section"
-The data for some configuration options is a colon-separated list of items.
+The data for some configuration options is a colon-separated list of items.
Many of these options are shown with type `string list' in the descriptions
-later in this document. Others are listed as `domain list', `host list',
-`address list', or `local part list'. Syntactically, they are all the same;
+later in this document. Others are listed as `domain list', `host list',
+`address list', or `local part list'. Syntactically, they are all the same;
however, those other than `string list' are subject to particular kinds of
interpretation, as described in chapter ~~CHAPdomhosaddlists.

  @@ -4711,7 +4697,7 @@
     check_local_user
     transport = local_delivery
   .endd
  -For each driver instance, you specify which Exim code module it uses -- by the 
  +For each driver instance, you specify which Exim code module it uses -- by the
   setting of the \driver\ option -- and (optionally) some configuration settings.
   For example, in the case of transports, if you want a transport to deliver with
   SMTP you would use the \%smtp%\ driver; if you want to deliver to a local file
  @@ -4824,7 +4810,7 @@


The first line defines a domain list called \*local@_domains*\; this is used
later in the configuration to identify domains that are to be delivered
-on the local host.
+on the local host.
.index @@ in a domain list
There is just one item in this list, the string `@@'. This is a special form of
entry which means `the name of the local host'. Thus, if the local host is
@@ -4854,7 +4840,7 @@
acl_smtp_rcpt = acl_check_rcpt
.endd
This option specifies an \*Access Control List*\ (ACL) which is to be used
-during an incoming SMTP session for every recipient of a message (every
+during an incoming SMTP session for every recipient of a message (every
\\RCPT\\ command). The name of the list is \*acl@_check@_rcpt*\, and we will
come to its definition below, in the ACL section of the configuration. ACLs
control which recipients are accepted for an incoming message -- if a
@@ -4880,14 +4866,12 @@
.display asis
# allow_domain_literals
.endd
-.em
The RFCs still require this form, but many people think that in the modern
Internet it makes little sense to permit mail to be sent to specific hosts by
quoting their IP addresses. This ancient format has been used by people who
try to abuse hosts by using them for unwanted relaying. However, some
-people believe there are circumstances (for example, messages addressed to
+people believe there are circumstances (for example, messages addressed to
\*postmaster*\) where domain literals are still useful.
-.nem

The next configuration line is a kind of trigger guard:
.display asis
@@ -4899,7 +4883,7 @@
The list of users specified by \never@_users\ is not, however, the complete
list; the build-time configuration in \(Local/Makefile)\ has an option called
\\FIXED@_NEVER@_USERS\\ specifying a list that cannot be overridden. The
-contents of \never@_users\ are added to this list. By default
+contents of \never@_users\ are added to this list. By default
\\FIXED@_NEVER@_USERS\\ also specifies root.

When a remote host connects to Exim in order to send mail, the only information
@@ -4912,7 +4896,7 @@
in order to get a host name. This improves the quality of the logging
information, but if you feel it is too expensive, you can remove it entirely,
or restrict the lookup to hosts on `nearby' networks.
-Note that it is not always possible to find a host name from an IP address,
+Note that it is not always possible to find a host name from an IP address,
because not all DNS reverse zones are maintained, and sometimes DNS servers are
unreachable.

@@ -5009,8 +4993,8 @@

   deny    domains       = !+local_domains
           local_parts   = ^[./|] : ^.*[@%!] : ^.*/\\.\\./
  -.endd         
  -These statements are concerned with local parts that contain any of the 
  +.endd
  +These statements are concerned with local parts that contain any of the
   characters `@@', `%', `!', `/', `|', or dots in unusual places. Although these
   characters are entirely legal in local parts (in the case of `@@' and leading
   dots, only if correctly quoted), they do not commonly occur in Internet mail
  @@ -5073,8 +5057,8 @@
   This statement requires the sender address to be verified before any subsequent
   ACL statement can be used. If verification fails, the incoming recipient
   address is refused. Verification consists of trying to route the address, to
  -see if a 
  -bounce 
  +see if a
  +bounce
   message could be delivered to it. In the case of remote addresses, basic
   verification checks only the domain, but \*callouts*\ can be used for more
   verification if required. Section ~~SECTaddressverification discusses the
  @@ -5198,8 +5182,8 @@


The name of the router driver is \%dnslookup%\,
and is specified by the \driver\ option. Do not be confused by the fact that
-the name of this router instance is the same as the name of the driver. The
-instance name is arbitrary, but the name set in the \driver\ option must be one
+the name of this router instance is the same as the name of the driver. The
+instance name is arbitrary, but the name set in the \driver\ option must be one
of the driver modules that is in the Exim binary.

The \%dnslookup%\ router routes addresses by looking up their domains in the
@@ -5211,7 +5195,7 @@

The \ignore@_target@_hosts\ option specifies a list of IP addresses that are to
be entirely ignored. This option is present because a number of cases have been
-encountered where MX records in the DNS point to host names
+encountered where MX records in the DNS point to host names
whose IP addresses are 0.0.0.0 or are in the 127 subnet (typically 127.0.0.1).
Completely ignoring these IP addresses causes Exim to fail to route the
email address, so it bounces. Otherwise, Exim would log a routing problem, and
@@ -5234,8 +5218,8 @@
the value of the \data\ option is empty, causing the address to be passed to
the next router.

-\(/etc/aliases)\ is a conventional name for the system aliases file that is
-often used. That is why it is referenced by from the default configuration
+\(/etc/aliases)\ is a conventional name for the system aliases file that is
+often used. That is why it is referenced by from the default configuration
file. However, you can change this by setting \\SYSTEM@_ALIASES@_FILE\\ in
\(Local/Makefile)\ before building Exim.

@@ -5259,7 +5243,7 @@
local user. If it is not, the router is skipped. When a local user is found,
the file called \(.forward)\ in the user's home directory is consulted. If it
does not exist, or is empty, the router declines. Otherwise, the contents of
-\(.forward)\ are interpreted as redirection data (see chapter ~~CHAPredirect
+\(.forward)\ are interpreted as redirection data (see chapter ~~CHAPredirect
for more details).

.index Sieve filter||enabling in default router
@@ -5272,15 +5256,15 @@

The \no@_verify\ and \no@_expn\ options mean that this router is skipped when
verifying addresses, or when running as a consequence of an SMTP \\EXPN\\
-command.
+command.
There are two reasons for doing this:
.numberpars
-Whether or not a local user has a \(.forward)\ file is not really relevant when
+Whether or not a local user has a \(.forward)\ file is not really relevant when
checking an address for validity; it makes sense not to waste resources doing
unnecessary work.
.nextp
-More importantly, when Exim is verifying addresses or handling an \\EXPN\\
-command during an SMTP session, it is running as the Exim user, not as root.
+More importantly, when Exim is verifying addresses or handling an \\EXPN\\
+command during an SMTP session, it is running as the Exim user, not as root.
The group is the Exim group, and no additional groups are set up.
It may therefore not be possible for Exim to read users' \(.forward)\ files at
this time.
@@ -5439,7 +5423,7 @@
.fi
(O'Reilly, ISBN 0-596-00289-0).

-The documentation for the syntax and semantics of the regular expressions that
+The documentation for the syntax and semantics of the regular expressions that
are supported by PCRE is included in plain text in the file
\(doc/pcrepattern.txt)\ in the Exim distribution, and also in the HTML
tarbundle of Exim documentation, and as an appendix to the
@@ -5456,9 +5440,8 @@
options set), except that the \\PCRE@_CASELESS\\ option is set when the
matching is required to be case-insensitive.

-.em
-In most cases, when a regular expression is required in an Exim configuration,
-it has to start with a circumflex, in order to distinguish it from plain text
+In most cases, when a regular expression is required in an Exim configuration,
+it has to start with a circumflex, in order to distinguish it from plain text
or an `ends with' wildcard. In this example of a configuration setting, the
second item in the colon-separated list is a regular expression.
.display asis
@@ -5472,26 +5455,25 @@
normal effect of `anchoring' it to the start of the string that is being
matched.

-There are, however, two cases where a circumflex is not required for the
+There are, however, two cases where a circumflex is not required for the
recognition of a regular expression: these are the \match\ condition in a
string expansion, and the \matches\ condition in an Exim filter file. In these
cases, the relevant string is always treated as a regular expression; if it
does not start with a circumflex, the expression is not anchored, and can match
anywhere in the subject string.

-In all cases, if you want a regular expression to match at the end of a string,
+In all cases, if you want a regular expression to match at the end of a string,
you must code the @$ metacharacter to indicate this. For example:
.display asis
domains = ^\\d{3}\\.example
.endd
-matches the domain \*123.example*\, but it also matches \*123.example.com*\.
+matches the domain \*123.example*\, but it also matches \*123.example.com*\.
You need to use:
.display asis
domains = ^\\d{3}\\.example\$
.endd
if you want \*example*\ to be the top-level domain. (The backslash before the
@$ is another artefact of string expansion.)
-.nem


.section Testing regular expressions
@@ -5552,8 +5534,8 @@
messages. Two different kinds of syntax are used:
.numberpars
A string that is to be expanded may contain explicit lookup requests. These
-cause parts of the string to be replaced by data that is obtained from the
-lookup.
+cause parts of the string to be replaced by data that is obtained from the
+lookup.
.nextp
Lists of domains, hosts, and email addresses can contain lookup requests as a
way of avoiding excessively long linear lists. In this case, the data that is
@@ -5563,7 +5545,7 @@
.endp
It is easy to confuse the two different kinds of lookup, especially as the
lists that may contain the second kind are always expanded before being
-processed as lists. Therefore, they may also contain lookups of the first kind.
+processed as lists. Therefore, they may also contain lookups of the first kind.
Be careful to distinguish between the following two examples:
.display asis
domains = ${lookup{$sender_host_address}lsearch{/some/file}}
@@ -5577,31 +5559,31 @@
192.168.3.4: domain1 : domain2 : ...
192.168.1.9: domain3 : domain4 : ...
.endd
-Thus, the result of the expansion is a list of domains (and possibly other
+Thus, the result of the expansion is a list of domains (and possibly other
types of item that are allowed in domain lists).

-In the second case, the lookup is a single item in a domain list. It causes
+In the second case, the lookup is a single item in a domain list. It causes
Exim to use a lookup to see if the domain that is being processed can be found
in the file. The file could contains lines like this:
.display asis
-domain1:
+domain1:
domain2:
.endd
-Any data that follows the keys is not relevant when checking that the domain
+Any data that follows the keys is not relevant when checking that the domain
matches the list item.

-It is possible to use both kinds of lookup at once. Consider a file containing
+It is possible to use both kinds of lookup at once. Consider a file containing
lines like this:
.display asis
192.168.5.6: lsearch;/another/file
.endd
-If the value of \$sender@_host@_address$\ is 192.168.5.6, expansion of the
-first \domains\ setting above generates the second setting, which therefore
+If the value of \$sender@_host@_address$\ is 192.168.5.6, expansion of the
+first \domains\ setting above generates the second setting, which therefore
causes a second lookup to occur.

The rest of this chapter describes the different lookup types that are
available. Any of them can be used in either of the circumstances described
-above. The syntax requirements for the two cases are described in chapters
+above. The syntax requirements for the two cases are described in chapters
~~CHAPexpand and ~~CHAPdomhosaddlists, respectively.

.section Lookup types
@@ -5664,11 +5646,11 @@
zero is included in the key that is passed to the DBM library. See section
~~SECTdb for a discussion of DBM libraries.
.index Berkeley DB library||file format
-For all versions of Berkeley DB, Exim uses the \\DB@_HASH\\ style of database
-when building DBM files using the \exim@_dbmbuild\ utility. However, when using
+For all versions of Berkeley DB, Exim uses the \\DB@_HASH\\ style of database
+when building DBM files using the \exim@_dbmbuild\ utility. However, when using
Berkeley DB versions 3 or 4, it opens existing databases for reading with the
\\DB@_UNKNOWN\\ option. This enables it to handle any of the types of database
-that the library supports, and can be useful for accessing DBM files created by
+that the library supports, and can be useful for accessing DBM files created by
other applications. (For earlier DB versions, \\DB@_HASH\\ is always used.)

.nextp
@@ -5697,7 +5679,6 @@
.nextp
.index lookup||iplsearch
.index iplsearch lookup type
-.em
\%iplsearch%\: The given file is a text file containing keys and data. A key is
terminated by a colon or white space or the end of the line. The keys in the
file must be IP addresses, or IP addresses with CIDR masks. Keys that involve
@@ -5712,17 +5693,16 @@
The key for an \%iplsearch%\ lookup must be an IP address (without a mask). The
file is searched linearly, using the CIDR masks where present, until a matching
key is found. The first key that matches is used; there is no attempt to find a
-`best' match. Apart from the way the keys are matched, the processing for
+`best' match. Apart from the way the keys are matched, the processing for
\%iplsearch%\ is the same as for \%lsearch%\.

\**Warning 1**\: Unlike most other single-key lookup types, a file of data for
\%iplsearch%\ can \*not*\ be turned into a DBM or cdb file, because those
lookup types support only literal keys.

-\**Warning 2**\: In a host list, you must always use \%net-iplsearch%\ so that
+\**Warning 2**\: In a host list, you must always use \%net-iplsearch%\ so that
the implicit key is the host's IP address rather than its name (see section
~~SECThoslispatsikey).
-.nem

.nextp
.index linear search
@@ -5746,10 +5726,8 @@
wildcarding of any kind.

.index lookup||lsearch, colons in keys
-In most \%lsearch%\ files, keys are not required to contain colons
-.em
+In most \%lsearch%\ files, keys are not required to contain colons
or @# characters, or
-.nem
whitespace. However, if you need this feature, it is available. If a key begins
with a doublequote character, it is terminated only by a matching quote (or end
of line), and the normal escaping rules apply to its contents (see section
@@ -5773,7 +5751,7 @@
\%wildlsearch%\ or \%nwildlsearch%\: These search a file linearly, like
\%lsearch%\, but instead of being interpreted as a literal string, each key may
be wildcarded. The difference between these two lookup types is that for
-\%wildlsearch%\, each key in the file is string-expanded before being used,
+\%wildlsearch%\, each key in the file is string-expanded before being used,
whereas for \%nwildlsearch%\, no expansion takes place.

   Like \%lsearch%\, the testing is done case-insensitively. The following forms
  @@ -5790,8 +5768,8 @@
   .display asis
   ^\N\d+\.a\.b\N    data for <digits>.a.b
   .endd
  -Note the use of \"@\N"\ to disable expansion of the contents of the regular 
  -expression. If you are using \%nwildlsearch%\, where the keys are not 
  +Note the use of \"@\N"\ to disable expansion of the contents of the regular
  +expression. If you are using \%nwildlsearch%\, where the keys are not
   string-expanded, the equivalent entry is:
   .display asis
   ^\d+\.a\.b        data for <digits>.a.b
  @@ -5804,8 +5782,8 @@
   escape all the backslashes inside the quotes.
   .nextp
   Although I cannot see it being of much use, the general matching function
  -that is used to implement 
  -\%(n)wildlsearch%\ 
  +that is used to implement
  +\%(n)wildlsearch%\
   means that the string may begin with a lookup name terminated by a semicolon,
   and followed by lookup data. For example:
   .display asis
  @@ -5825,7 +5803,7 @@
   .section Query-style lookup types
   .index lookup||query-style types
   .index query-style lookup||list of types
  -The supported query-style lookup types are listed below. Further details about 
  +The supported query-style lookup types are listed below. Further details about
   many of them are given in later sections.
   .numberpars $.
   .index DNS||as a lookup type
  @@ -5936,16 +5914,16 @@
   .display asis
   data = ${lookup{$local_part@$domain}lsearch*@{/etc/mixed-aliases}}
   .endd
  -Suppose the address that is being processed is \*jane@@eyre.example*\. Exim 
  +Suppose the address that is being processed is \*jane@@eyre.example*\. Exim
   looks up these keys, in this order:
   .display asis
   jane@???
   *@eyre.example
   *
   .endd
  -The data is taken from whichever key it finds first. \**Note**\: in an 
  -\%lsearch%\ file, this does not mean the first of these keys in the file. A 
  -complete scan is done for each key, and only if it is not found at all does 
  +The data is taken from whichever key it finds first. \**Note**\: in an
  +\%lsearch%\ file, this does not mean the first of these keys in the file. A
  +complete scan is done for each key, and only if it is not found at all does
   Exim move on to try the next key.



@@ -5970,14 +5948,14 @@
by \*dates.fict.example*\, if that does not appear as a separate key in the
file.

-\**Note**\: Partial matching is not available for query-style lookups. It is
+\**Note**\: Partial matching is not available for query-style lookups. It is
also not available for any lookup items in address lists (see section
~~SECTaddresslist).

Partial matching is implemented by doing a series of separate lookups using
keys constructed by modifying the original subject key. This means that it can
be used with any of the single-key lookup types, provided that
-partial matching keys
+partial matching keys
beginning with a special prefix (default `$*$.') are included in the data file.
Keys in the file that do not begin with the prefix are matched only by
unmodified subject keys when partial matching is in use.
@@ -6003,11 +5981,11 @@
*.fict.example
.endd
As soon as one key in the sequence is successfully looked up, the lookup
-finishes.
+finishes.

.index lookup||partial matching, changing prefix
.index prefix||for partial matching
-The use of `$*$.' as the partial matching prefix is a default that can be
+The use of `$*$.' as the partial matching prefix is a default that can be
changed. The motivation for this feature is to allow Exim to operate with file
formats that are used by other MTAs. A different prefix can be supplied in
parentheses instead of the hyphen after `partial'. For example:
@@ -6015,7 +5993,7 @@
domains = partial(.)lsearch;/some/file
.endd
In this example, if the domain is \*a.b.c*\, the sequence of lookups is
-\"a.b.c"\, \".a.b.c"\, and \".b.c"\ (the default minimum of 2 non-wild
+\"a.b.c"\, \".a.b.c"\, and \".b.c"\ (the default minimum of 2 non-wild
components is unchanged). The prefix may consist of any punctuation characters
other than a closing parenthesis. It may be empty, for example:
.display asis
@@ -6034,7 +6012,7 @@
example, the final lookup for `partial0(.)' is for \"."\ alone.
.nextp
Otherwise, if the prefix ends in a dot, the dot is removed, and the
-remainder is looked up. With the default prefix, therefore, the final lookup is
+remainder is looked up. With the default prefix, therefore, the final lookup is
for `$*$' on its own.
.nextp
Otherwise, the whole prefix is looked up.
@@ -6057,7 +6035,7 @@


.section Lookup caching
-.index lookup||caching
+.index lookup||caching
.index caching||lookup data
An Exim process
caches the most recent lookup result on a per-file basis for single-key
@@ -6115,9 +6093,7 @@
.display asis
${lookup dnsdb{mx=a.b.example}{$value}fail}
.endd
-.em
-The supported record types are A, CNAME, MX, NS, PTR, SRV, and TXT,
-.nem
+The supported record types are A, CNAME, MX, NS, PTR, SRV, and TXT,
and, when Exim is compiled with IPv6 support, AAAA (and A6 if that is also
configured). If no type is given, TXT is assumed. When the type is PTR, the
address should be given as normal; it is converted to the necessary inverted
@@ -6128,12 +6104,10 @@

.index MX record||in \%dnsdb%\ lookup
For MX records, both the preference value and the host name are returned,
-separated by a space.
-.em
+separated by a space.
.index SRV record||in \%dnsdb%\ lookup
-For SRV records, the priority, weight, port, and host name are returned,
+For SRV records, the priority, weight, port, and host name are returned,
separated by spaces. For any record type,
-.nem
if multiple records are found (or, for A6 lookups, if a single record leads to
multiple addresses), the data is returned as a concatenation, separated by
newlines. The order, of course, depends on the DNS resolver.
@@ -6201,7 +6175,7 @@
.index LDAP||quoting
Two levels of quoting are required in LDAP queries, the first for LDAP itself
and the second because the LDAP query is represented as a URL. Furthermore,
-within an LDAP query, two different kinds of quoting are required. For this
+within an LDAP query, two different kinds of quoting are required. For this
reason, there are two different LDAP-specific quoting operators.

The \quote@_ldap\ operator is designed for use on strings that are part of
@@ -6241,7 +6215,7 @@
before any trailing spaces. (These rules are in RFC 2253.) The resulting string
is then quoted according to the rules for URLs. For example:
.display asis
-${quote_ldap_dn: a(bc)*, a<yz>; }
+${quote_ldap_dn: a(bc)*, a<yz>; }
.endd
yields
.display asis
@@ -6251,7 +6225,7 @@
.display asis
\ a(bc)*\, a\<yz\>\;\
.endd
-There are some further comments about quoting in the section on LDAP
+There are some further comments about quoting in the section on LDAP
authentication below.

.section LDAP connections
@@ -6318,7 +6292,7 @@
Using a pathname with \"ldap"\ or \"ldaps"\ forces the use of the Unix domain
interface.
.nextp
-Using \"ldapi"\ with a host name causes an error.
+Using \"ldapi"\ with a host name causes an error.
.endp

Using \"ldapi"\ with no host or path in the query, and no setting of
@@ -6332,7 +6306,7 @@
be preceded by any number of `<<name>>=<<value>>' settings, separated by
spaces. If a value contains spaces it must be enclosed in double quotes, and
when double quotes are used, backslash is interpreted in the usual way inside
-them.
+them.

   The following names are recognized:
   .display
  @@ -6344,7 +6318,7 @@
   SIZE        $rm{set the limit for the number of entries returned}
   TIME        $rm{set the maximum waiting time for a query}
   .endd
  -The value of the \\DEREFERENCE\\ parameter must be one of the words `never', 
  +The value of the \\DEREFERENCE\\ parameter must be one of the words `never',
   `searching', `finding', or `always'.


Here is an example of an LDAP query in an Exim lookup that uses some of these
@@ -6378,7 +6352,7 @@
It makes it possible to use the same \quote@_ldap@_dn\ expansion for \\USER=\\
DNs as with DNs inside actual queries.
.nextp
-It permits spaces inside \\USER=\\ DNs.
+It permits spaces inside \\USER=\\ DNs.
.endp
For example, a setting such as
.display asis
@@ -6386,9 +6360,9 @@
.endd
should work even if \$1$\ contains spaces.

-Expanded data for the \\PASS=\\ value should be quoted using the \quote\
-expansion operator, rather than the LDAP quote operators. The only reason this
-field needs quoting is to ensure that it conforms to the Exim syntax, which
+Expanded data for the \\PASS=\\ value should be quoted using the \quote\
+expansion operator, rather than the LDAP quote operators. The only reason this
+field needs quoting is to ensure that it conforms to the Exim syntax, which
does not allow unquoted spaces. For example:
.display asis
PASS=${quote:$3}
@@ -6658,9 +6632,9 @@
list is negative. In other words, a list that ends with a negative item behaves
as if it had an extra item \":*"\ on the end.

-Another way of thinking about positive and negative items in lists is to read
-the connector as `or' after a positive item and as `and' after a negative
-item.
+Another way of thinking about positive and negative items in lists is to read
+the connector as `or' after a positive item and as `and' after a negative
+item.


.section File names in lists
@@ -6712,7 +6686,7 @@
non-constant pattern. This is not the case. The keys in an \%lsearch%\ file are
always fixed strings, just as for any other single-key lookup type.

-If you want to use a file to contain wild-card patterns that form part of a
+If you want to use a file to contain wild-card patterns that form part of a
list, just give the file name on its own, without a search type, as described
in the previous section.

@@ -6775,7 +6749,7 @@
.display asis
domainlist dom2 = !a.b : *.b
.endd
-where \*x.y*\ does not match. It's best to avoid negation altogether in
+where \*x.y*\ does not match. It's best to avoid negation altogether in
referenced lists if you can.

Named lists may have a performance advantage. When Exim is routing an
@@ -6785,7 +6759,7 @@
domains = +local_domains
.endd
on several of your routers
-or in several ACL statements,
+or in several ACL statements,
the actual test is done only for the first one. However, the caching works only
if there are no expansions within the list itself or any sublists that it
references. In other words, caching happens only for lists that are known to be
@@ -6823,7 +6797,6 @@
.endd


-.em
.section Named list caching
.index list||caching of named
.index caching||named lists
@@ -6850,7 +6823,6 @@
.endd
If you do this, you should be absolutely sure that caching is going to do
the right thing in all cases. When in doubt, leave it out.
-.nem


.section Domain lists
@@ -6861,7 +6833,7 @@
The following types of item may appear in domain lists:
.numberpars $.
.index primary host name
-.index host||name, matched in domain list
+.index host||name, matched in domain list
.index \primary@_hostname\
.index domain list||matching primary host name
.index @@ in a domain list
@@ -6875,10 +6847,8 @@
.index domain literal
If a pattern consists of the string \"@@[]"\ it matches any local IP interface
address, enclosed in square brackets, as in an email address that contains a
-domain literal.
-.em
+domain literal.
In today's Internet, the use of domain literals is controversial.
-.nem
.nextp
.index @@mx@_any
.index @@mx@_primary
@@ -6893,17 +6863,16 @@
but a secondary MX target is. `Primary' means an MX record with the lowest
preference value -- there may of course be more than one of them.

-.em
-The MX lookup that takes place when matching a pattern of this type is
-performed with the resolver options for widening names turned off. Thus, for
-example, a single-component domain will \*not*\ be expanded by adding the
-resolver's default domain. See the \qualify@_single\ and \search@_parents\
+The MX lookup that takes place when matching a pattern of this type is
+performed with the resolver options for widening names turned off. Thus, for
+example, a single-component domain will \*not*\ be expanded by adding the
+resolver's default domain. See the \qualify@_single\ and \search@_parents\
options of the \%dnslookup%\ router for a discussion of domain widening.

Sometimes you may want to ignore certain IP addresses when using one of these
patterns. You can specify this by following the pattern with \"/ignore=<<ip
list>>"\, where <<ip list>> is a list of IP addresses. These addresses are
-ignored when processing the pattern (compare the \ignore@_target@_hosts\ option
+ignored when processing the pattern (compare the \ignore@_target@_hosts\ option
on a router). For example:
.display asis
domains = @mx_any/ignore=127.0.0.1
@@ -6911,8 +6880,8 @@
This example matches any domain that has an MX record pointing to one of
the local host's IP addresses other than 127.0.0.1.

-The list of IP addresses is in fact processed by the same code that processes
-host lists, so it may contain CIDR-coded network specifications and it may also
+The list of IP addresses is in fact processed by the same code that processes
+host lists, so it may contain CIDR-coded network specifications and it may also
contain negative items.

   Because the list of IP addresses is a sublist within a domain list, you have to
  @@ -6928,7 +6897,6 @@
   domains = <? @mx_any/ignore=<;127.0.0.1;::1 ? \
             an.other.domain ? ...
   .endd
  -.nem


.nextp
.index asterisk||in domain list
@@ -7072,13 +7040,11 @@
This typically causes a forward DNS lookup of the name. The result is compared
with the IP address of the subject host.

-.em
If there is a temporary problem (such as a DNS timeout) with the host name
-lookup, a temporary error occurs. For example, if the list is being used in an
+lookup, a temporary error occurs. For example, if the list is being used in an
ACL condition, the ACL gives a `defer' response, usually leading to a temporary
SMTP error code. If no IP address can be found for the host name, what happens
is described in section ~~SECTbehipnot below.
-.nem

.nextp
.index @@ in a host list
@@ -7108,7 +7074,7 @@
host under the given mask.
This allows, an entire network of hosts to be included (or excluded) by a
single item.
-.index CIDR notation
+.index CIDR notation
The mask uses CIDR notation; it specifies the number of address bits that must
match, starting from the most significant end of the address.

@@ -7119,8 +7085,8 @@
.display asis
192.168.23.236/31
.endd
-matches just two addresses, 192.168.23.236 and 192.168.23.237. A mask value of
-32 for an IPv4 address is the same as no mask at all; just a single address
+matches just two addresses, 192.168.23.236 and 192.168.23.237. A mask value of
+32 for an IPv4 address is the same as no mask at all; just a single address
matches.

Here is another example which shows an IPv4 and an IPv6 network:
@@ -7200,15 +7166,14 @@
.rset SECThoslispatnam "~~chapter.~~section"
.index host||lookup failures
.index unknown host name
-.index host list||matching host name
+.index host list||matching host name
There are several types of pattern that require Exim to know the name of the
remote host. These are either wildcard patterns or lookups by name. (If a
complete hostname is given without any wildcarding, it is used to find an IP
address to match against, as described in the section ~~SECThoslispatip above.)

If the remote host name is not already known when Exim encounters one of these
-patterns, it has to be found from the IP address.
-.em
+patterns, it has to be found from the IP address.
Although many sites on the Internet are conscientious about maintaining reverse
DNS data for their hosts, there are also many that do not do this.
Consequently, a name cannot always be found, and this may lead to unwanted
@@ -7225,7 +7190,6 @@

There are some options that control what happens if a host name cannot be
found. These are described in section ~~SECTbehipnot below.
-.nem


.index host||alias for
@@ -7255,22 +7219,19 @@
.display asis
sender_unqualified_hosts = \N^(a|b)\.c\.d$\N : ....
.endd
-.em
-\**Warning**\: If you want to match a complete host name, you must include the
-\"@$"\ terminating metacharacter in the regular expression, as in the above
-example. Without it, a match at the start of the host name is all that is
+\**Warning**\: If you want to match a complete host name, you must include the
+\"@$"\ terminating metacharacter in the regular expression, as in the above
+example. Without it, a match at the start of the host name is all that is
required.
-.nem
.endp


-.em
.section Behaviour when an IP address or name cannot be found
.rset SECTbehipnot "~~chapter.~~section"
.index host||lookup failures
-While processing a host list, Exim may need to look up an IP address from a
-name (see section ~~SECThoslispatip), or it may need to look up a host name
-from an IP address (see section ~~SECThoslispatnam). In either case, the
+While processing a host list, Exim may need to look up an IP address from a
+name (see section ~~SECThoslispatip), or it may need to look up a host name
+from an IP address (see section ~~SECThoslispatnam). In either case, the
behaviour when it fails to find the information it is seeking is the same.

   .index \"+include@_unknown"\
  @@ -7288,24 +7249,23 @@
   rejects connections from any host whose name matches \"*.enemy.ex"\, and also
   any hosts whose name it cannot find.
   .nextp
  -If any item that follows \"+ignore@_unknown"\ requires information that cannot 
  -be found, Exim ignores that item and proceeds to the rest of the list. For 
  +If any item that follows \"+ignore@_unknown"\ requires information that cannot
  +be found, Exim ignores that item and proceeds to the rest of the list. For
   example:
   .display asis
   accept hosts = +ignore_unknown : friend.example : \
                  192.168.4.5
   .endd
  -accepts from any host whose name is \*friend.example*\ and from 192.168.4.5, 
  -whether or not its host name can be found. Without \"+ignore@_unknown"\, if no 
  +accepts from any host whose name is \*friend.example*\ and from 192.168.4.5,
  +whether or not its host name can be found. Without \"+ignore@_unknown"\, if no
   name can be found for 192.168.4.5, it is rejected.
   .endp
   Both \"+include@_unknown"\ and \"+ignore@_unknown"\ may appear in the same
  -list. The effect of each one lasts until the next, or until the end of the 
  +list. The effect of each one lasts until the next, or until the end of the
   list.


\**Note**\: This section applies to permanent lookup failures. It does \*not*\
apply to temporary DNS errors. They always cause a defer action.
-.nem


.section Host list patterns for single-key lookups by host name
@@ -7350,13 +7310,13 @@
If you want to use masked IP addresses in database queries, you can use the
\mask\ expansion operator.

-If the query contains a reference to \$sender@_host@_name$\, Exim automatically
+If the query contains a reference to \$sender@_host@_name$\, Exim automatically
looks up the host name if has not already done so. (See section
~~SECThoslispatnam for comments on finding host names.)

-Historical note: prior to release 4.30, Exim would always attempt to find a
+Historical note: prior to release 4.30, Exim would always attempt to find a
host name before running the query, unless the search type was preceded by
-\"net-"\. This is no longer the case. For backwards compatibility, \"net-"\ is
+\"net-"\. This is no longer the case. For backwards compatibility, \"net-"\ is
still recognized for query-style lookups, but its presence or absence has no
effect. (Of course, for single-key lookups, \"net-"\ $it{is} important.)

@@ -7424,7 +7384,7 @@
.index @@@@ with single-key lookup
.index address list||@@@@ lookup type
.index address list||split local part and domain
-If a pattern starts with `@@@@' followed by a single-key lookup item
+If a pattern starts with `@@@@' followed by a single-key lookup item
(for example, \"@@@@lsearch;/some/file"\), the address that is being checked is
split into a local part and a domain. The domain is looked up in the file. If
it is not found, there is no match. If it is found, the data that is looked up
@@ -7474,12 +7434,12 @@
It is possible to construct loops using this facility, and in order to catch
them, the chains may be no more than fifty items long.
.nextp
-The @@@@<<lookup>> style of item can also be used with a query-style
-lookup, but in this case, the chaining facility is not available. The lookup
+The @@@@<<lookup>> style of item can also be used with a query-style
+lookup, but in this case, the chaining facility is not available. The lookup
can only return a single list of local parts.
.nextp
.index address list||lookup for complete address
-Complete addresses can be looked up by using a pattern that
+Complete addresses can be looked up by using a pattern that
starts with a lookup type terminated by a semicolon, follwed by the data for
the lookup.
For example:
@@ -7490,11 +7450,11 @@
.endd
For a single-key lookup type, Exim uses the complete address as the key.
Partial matching (section ~~SECTpartiallookup) cannot be used, and is ignored
-if specified, with an entry being written to the panic log.
+if specified, with an entry being written to the panic log.

.index @*@@ with single-key lookup
You can configure lookup defaults, as described in section
-~~SECTdefaultvaluelookups, but this is useful only for the `$*$@@' type of
+~~SECTdefaultvaluelookups, but this is useful only for the `$*$@@' type of
default. For example, with this lookup:
.display asis
accept senders = lsearch*@;/some/file
@@ -7511,7 +7471,7 @@
*@jaeger.example
*
.endd
-\**Warning 1**\: Do not include a line keyed by `$*$' in the file, because that
+\**Warning 1**\: Do not include a line keyed by `$*$' in the file, because that
would mean that every address matches, thus rendering the test useless.

\**Warning 2**\: Do not confuse these two kinds of item:
@@ -7519,7 +7479,7 @@
deny recipients = dbm*@;/some/file
deny recipients = *@dbm;/some/file
.endd
-The first does a whole address lookup, with defaulting, as just described,
+The first does a whole address lookup, with defaulting, as just described,
because it starts with a lookup type. The second matches the local part and
domain independently, as described in the next paragraph.
.nextp
@@ -7632,7 +7592,7 @@
When a string is being expanded it is copied verbatim from left to right except
when a dollar or backslash character is encountered. A dollar specifies the
start of a portion of the string which is interpreted and replaced as described
-below in section ~~SECTexpansionitems onwards. Backslash is used as an escape
+below in section ~~SECTexpansionitems onwards. Backslash is used as an escape
character, as described in the following section.


@@ -7725,8 +7685,8 @@

.item "@$@{extract@{<<key>>@}@{<<string1>>@}@{<<string2>>@}@{<<string3>>@}@}"
.index expansion||extracting substrings by key
-The key and <<string1>> are first expanded separately.
-Leading and trailing whitespace is removed from the key (but not from any of
+The key and <<string1>> are first expanded separately.
+Leading and trailing whitespace is removed from the key (but not from any of
the strings).
The key must not consist entirely of digits. The expanded <<string1>> must be
of the form:
@@ -7768,7 +7728,7 @@
.item "@$@{extract@{<<number>>@}@{<<separators>>@}@{<<string1>>@}@{<<string2>>@}@{<<string3>>@}@}"
.index expansion||extracting substrings by number
The <<number>> argument must consist entirely of decimal digits,
-apart from leading and trailing whitespace, which is ignored.
+apart from leading and trailing whitespace, which is ignored.
This is what distinguishes this form of \extract\ from the previous kind. It
behaves in the same way, except that, instead of extracting a named field, it
extracts from <<string1>> the field whose number is given as the first
@@ -7797,12 +7757,12 @@
.item "@$@{hash@{<<string1>>@}@{<<string2>>@}@{<<string3>>@}@}"
.index hash function||textual
.index expansion||textual hash
-This is a textual hashing function, and was the first to be implemented in
-early versions of Exim. In current releases, there are other hashing functions
+This is a textual hashing function, and was the first to be implemented in
+early versions of Exim. In current releases, there are other hashing functions
(numeric, MD5, and SHA-1), which are described below.

-The first two strings, after expansion, must be numbers. Call them <<m>> and
-<<n>>. If you are using fixed values for these numbers, that is, if <<string1>>
+The first two strings, after expansion, must be numbers. Call them <<m>> and
+<<n>>. If you are using fixed values for these numbers, that is, if <<string1>>
and <<string2>> do not change when they are expanded, you can use the
simpler operator notation that avoids some of the braces:
.display
@@ -7810,7 +7770,7 @@
.endd
The second number is optional (in both notations).

  -If <<n>> is greater than or equal to the length of the string, the expansion 
  +If <<n>> is greater than or equal to the length of the string, the expansion
   item returns the string. Otherwise it computes a new string of length <<n>> by
   applying a hashing function to the string. The new string consists of
   characters taken from the first <<m>> characters of the string
  @@ -7820,9 +7780,9 @@
   If <<m>> is not present the value 26 is used, so that only lower case
   letters appear. For example:
   .display
  -@$@{hash@{3@}@{monty@}@}              $rm{yields}  \"jmg"\     
  -@$@{hash@{5@}@{monty@}@}              $rm{yields}  \"monty"\   
  -@$@{hash@{4@}@{62@}@{monty python@}@}   $rm{yields}  \"fbWx"\    
  +@$@{hash@{3@}@{monty@}@}              $rm{yields}  \"jmg"\
  +@$@{hash@{5@}@{monty@}@}              $rm{yields}  \"monty"\
  +@$@{hash@{4@}@{62@}@{monty python@}@}   $rm{yields}  \"fbWx"\
   .endd



@@ -7842,10 +7802,10 @@
.endd
The newline that terminates a header line is not included in the expansion, but
internal newlines (caused by splitting the header line over several physical
-lines) may be present.
+lines) may be present.

-The difference between \rheader\, \bheader\, and \header\ is in the way the
-data in the header line is interpreted.
+The difference between \rheader\, \bheader\, and \header\ is in the way the
+data in the header line is interpreted.
.numberpars $.
\rheader\ gives the original `raw' content of the header line, with no
processing at all, and without the removal of leading and trailing whitespace.
@@ -7854,7 +7814,7 @@
\bheader\ removes leading and trailing whitespace, and then decodes base64 or
quoted-printable MIME `words' within the header text, but does no character
set translation. If decoding of what looks superficially like a MIME `word'
-fails, the raw string is returned.
+fails, the raw string is returned.
.index binary zero||in header line
If decoding produces a binary zero character, it is replaced by a question mark
-- this is what Exim does for binary zeros that are actually received in header
@@ -7887,7 +7847,7 @@

Only header lines that are common to all copies of a message are visible to
this mechanism. These are the original header lines that are received with the
-message, and any that are added by
+message, and any that are added by
an ACL \warn\ statement or by
a system filter. Header lines that are added to a particular copy of a message
by a router or transport are not accessible.
@@ -7905,7 +7865,7 @@
white space terminates the header name, it is included in the expanded string.
If the message does not contain the given header, the expansion item is
replaced by an empty string. (See the \def\ condition in section ~~SECTexpcond
-for a means of testing for the existence of a header.)
+for a means of testing for the existence of a header.)

   If there is more than one header with the same name, they are all concatenated
   to form the substitution string, up to a maximum length of 64K. A newline
  @@ -7920,10 +7880,10 @@
   .index expansion||hmac hashing
   This function uses cryptographic hashing (either MD5 or SHA-1) to convert a
   shared secret and some text into a message authentication code, as specified in
  -RFC 2104. 
  +RFC 2104.
   This differs from \"@$@{md5:secret@_text...@}"\ or
  -\"@$@{sha1:secret@_text...@}"\ in that the hmac step adds a signature to the 
  -cryptographic hash, allowing for authentication that is not possible with MD5 
  +\"@$@{sha1:secret@_text...@}"\ in that the hmac step adds a signature to the
  +cryptographic hash, allowing for authentication that is not possible with MD5
   or SHA-1 alone.
   The hash name must expand to either \"md5"\ or \"sha1"\ at present. For
   example:
  @@ -7948,8 +7908,8 @@
     {${primary_hostname},${message_id},$h_message-id:}}
   .endd
   Then given a message, you can check where it was scanned by looking at the
  -::X-Spam-Scanned:: header line. If you know the secret, you can check that this 
  -header line is authentic by recomputing the authentication code from the host 
  +::X-Spam-Scanned:: header line. If you know the secret, you can check that this
  +header line is authentic by recomputing the authentication code from the host
   name, message ID and the ::Message-id:: header line. This can be done using
   Exim's \-be-\ option, or by other means, for example by using the
   \*hmac@_md5@_hex()*\ function in Perl.
  @@ -7972,7 +7932,7 @@


.item "@$@{length@{<<string1>>@}@{<<string2>>@}@}"
.index expansion||string truncation
-The \length\ item is used to extract the initial portion of a string. Both
+The \length\ item is used to extract the initial portion of a string. Both
strings are expanded, and the first one must yield a number, <<n>>, say. If you
are using a fixed value for the number, that is, if <<string1>> does not change
when expanded, you can use the simpler operator notation that avoids some of
@@ -7981,7 +7941,7 @@
@$@{length@_<<n>>:<<string>>@}
.endd
The result of this item is either the first <<n>> characters or the whole
-of <<string2>>, whichever is the shorter. Do not confuse \length\ with
+of <<string2>>, whichever is the shorter. Do not confuse \length\ with
\strlen\, which gives the length of a string.


@@ -8070,13 +8030,13 @@
This item is available only if Exim has been built to include an embedded Perl
interpreter. The subroutine name and the arguments are first separately
expanded, and then the Perl subroutine is called with those arguments. No
-additional arguments need be given; the maximum number permitted, including the
+additional arguments need be given; the maximum number permitted, including the
name of the subroutine, is nine.

The return value of the subroutine is inserted into the expanded string, unless
the return value is \undef\. In that case, the expansion fails in the same way
-as an explicit `fail' on a lookup item.
-The return value is a scalar. Whatever you return is evaluated in a scalar
+as an explicit `fail' on a lookup item.
+The return value is a scalar. Whatever you return is evaluated in a scalar
context. For example, if you return the name of a Perl vector, the
return value is the size of the vector, not its contents.

@@ -8095,8 +8055,8 @@
then read, and its contents replace the entire item. All newline characters in
the file are replaced by the end-of-line string if it is present. Otherwise,
newlines are left in the string.
-String expansion is not applied to the contents of the file. If you want this,
-you must wrap the item in an \expand\ operator. If the file cannot be read, the
+String expansion is not applied to the contents of the file. If you want this,
+you must wrap the item in an \expand\ operator. If the file cannot be read, the
string expansion fails.

The \%redirect%\ router has an option called \forbid@_filter@_readfile\ which
@@ -8154,7 +8114,7 @@
locks out the use of this expansion item in filter files.

.item "@$rheader@_<<header name>>:#$rm{or}#@$rh@_<<header name>>:"
-This item inserts `raw' header lines. It is described with the \header\
+This item inserts `raw' header lines. It is described with the \header\
expansion item above.


@@ -8183,12 +8143,12 @@
endif
.endd
If execution of the command fails (for example, the command does not exist),
-the return code is 127 -- the same code that shells use for non-existent
+the return code is 127 -- the same code that shells use for non-existent
commands.

-\**Warning**\: In a router or transport, you cannot assume the order in which
-option values are expanded, except for those pre-conditions whose order of
-testing is documented. Therefore, you cannot reliably expect to set \$runrc$\
+\**Warning**\: In a router or transport, you cannot assume the order in which
+option values are expanded, except for those pre-conditions whose order of
+testing is documented. Therefore, you cannot reliably expect to set \$runrc$\
by the expansion of one option, and use it in another.

The \%redirect%\ router has an option called \forbid@_filter@_run\ which locks
@@ -8216,7 +8176,7 @@
${sg{1=A 4=D 3=C}{\N(\d+)=\N}{K\$1=}}
.endd
yields `K1=A K4=D K3=C'.
-Note the use of \"@\N"\ to protect the contents of the regular expression from
+Note the use of \"@\N"\ to protect the contents of the regular expression from
string expansion.


@@ -8312,13 +8272,11 @@
zeros. \**Note**\: Just to be absolutely clear: this is \*not*\ base64
encoding.

-.em
.item "@$@{base62d:<<base-62 digits>>@}"
.index base62
.index expansion||conversion to base 62
The string must consist entirely of base-62 digits. The number is converted to
decimal and output as a string.
-.nem


.item "@$@{domain:<<string>>@}"
@@ -8336,7 +8294,6 @@
controlled by the \print@_topbitchars\ option.


-.em
.item "@$@{eval:<<string>>@}"
.item "@$@{eval10:<<string>>@}"
.index expansion||expression evaluation
@@ -8346,13 +8303,12 @@
the four basic operators (plus, minus, times, divide) and parentheses. All
operations are carried out using integer arithmetic. Plus and minus have a
lower priority than times and divide; operators with the same priority are
-evaluated from left to right.
+evaluated from left to right.

For \eval\, numbers may be decimal, octal (starting with `0') or hexadecimal
(starting with `0x'). For \eval10\, all numbers are taken as decimal, even if
they start with a leading zero. This can be useful when processing numbers
extracted from dates or times, which often do have leading zeros.
-.nem

A number may be followed by `K' or `M' to multiply it by 1024 or 1024$*$1024,
respectively. Negative numbers are supported. The result of the computation is
@@ -8403,18 +8359,18 @@

Unicode code points with values less than 256 are compatible with ASCII and
ISO-8859-1 (also known as Latin-1).
-For example, character 169 is the copyright symbol in both cases, though the
+For example, character 169 is the copyright symbol in both cases, though the
way it is encoded is different. In UTF-8, more than one byte is needed for
characters with code values greater than 127, whereas ISO-8859-1 is a
-single-byte encoding (but thereby limited to 256 characters). This makes
+single-byte encoding (but thereby limited to 256 characters). This makes
translation from UTF-8 to ISO-8859-1 straightforward.


.item "@$@{hash@_<<n>>@_<<m>>:<<string>>@}"
.index hash function||textual
.index expansion||textual hash
-The \hash\ operator is a simpler interface to the hashing function that can be
-used when the two parameters are fixed numbers (as opposed to strings that
+The \hash\ operator is a simpler interface to the hashing function that can be
+used when the two parameters are fixed numbers (as opposed to strings that
change when expanded). The effect is the same as
.display
@$@{hash@{<<n>>@}@{<<m>>@}@{<<string>>@}@}
@@ -8427,7 +8383,7 @@
.item "@$@{hex2b64:<<hexstring>>@}"
.index base64 encoding||conversion from hex
.index expansion||hex to base64
-This operator converts a hex string into one that is base64 encoded. This can
+This operator converts a hex string into one that is base64 encoded. This can
be useful for processing the output of the MD5 and SHA-1 hashing functions.


@@ -8450,7 +8406,7 @@
.display
@$@{length@{<<number>>@}@{<<string>>@}@}
.endd
-See the description of the general \length\ item above for details. Note that
+See the description of the general \length\ item above for details. Note that
\length\ is not the same as \strlen\. The abbreviation \l\ can be used when
\length\ is used as an operator.

@@ -8512,7 +8468,7 @@
.item "@$@{quote:<<string>>@}"
.index quoting||in string expansions
.index expansion||quoting
-The \quote\ operator puts its argument into double quotes if it
+The \quote\ operator puts its argument into double quotes if it
is an empty string or
contains anything other than letters, digits, underscores, dots, and hyphens.
Any occurrences of double quotes and backslashes are escaped with a backslash.
@@ -8529,8 +8485,8 @@
variable or a message header.

.item "@$@{quote@_local@_part:<<string>>@}"
-This operator is like \quote\, except that it quotes the string only if
-required to do so by the rules of RFC 2822 for quoting local parts. For
+This operator is like \quote\, except that it quotes the string only if
+required to do so by the rules of RFC 2822 for quoting local parts. For
example, a plus sign would not cause quoting (but it would for \quote\).
If you are creating a new email address from the contents of \$local@_part$\
(or any other unknown data), you should always use this operator.
@@ -8544,7 +8500,7 @@
.display asis
${quote_ldap:two * two}
.endd
-returns
+returns
.display asis
two%20%5C2A%20two
.endd
@@ -8569,7 +8525,7 @@
If the string contains only characters in the range 33--126, and no instances
of the characters
.display asis
-? = ( ) < > @ , ; : \ " . [ ] _
+? = ( ) < > @ , ; : \ " . [ ] _
.endd
it is not modified. Otherwise, the result is the RFC 2047 encoding, as a single
`coded word'.
@@ -8588,7 +8544,7 @@
The string, after expansion, must be a file path. A call to the \*stat()*\
function is made for this path. If \*stat()*\ fails, an error occurs and the
expansion fails. If it succeeds, the data from the stat replaces the item, as a
-series of <<name>>=<<value>> pairs, where the values are all numerical,
+series of <<name>>=<<value>> pairs, where the values are all numerical,
except for the value of `smode'. The names are: `mode' (giving the mode as a
4-digit octal number), `smode' (giving the mode in symbolic format as a
10-character string, as for the \*ls*\ command), `inode', `device', `links',
@@ -8600,7 +8556,7 @@
.item "@$@{strlen:<<string>>@}"
.index expansion||string length
.index string||length in expansion
-The item is replace by the length of the expanded string, expressed as a
+The item is replace by the length of the expanded string, expressed as a
decimal number. \**Note**\: Do not confuse \strlen\ with \length\.


@@ -8617,7 +8573,6 @@
See the description of the general \substr\ item above for details. The
abbreviation \s\ can be used when \substr\ is used as an operator.

-.em
.item "@$@{time@_interval:<<string>>@}"
.index \time@_interval\
.index time interval||formatting
@@ -8625,7 +8580,6 @@
represents an interval of time as a number of seconds. It is converted into a
number of larger units and output in Exim's normal time format, for example,
\"1w3d4h2m6s"\.
-.nem

.item "@$@{uc:<<string>>@}"
.index case forcing in strings
@@ -8700,7 +8654,7 @@
.display asis
${if crypteq {test}{\{md5\}CY9rzUYh03PK3k6DJie09g==}{yes}{no}}
.endd
-The following encryption types
+The following encryption types
(whose names are matched case-independently)
are supported:
.numberpars $.
@@ -8714,14 +8668,14 @@
comparison fails.
.nextp
.index SHA-1 hash
-\@{sha1@}\ computes the SHA-1 digest of the first string, and expresses this as
-printable characters to compare with the remainder of the second string. If the
-length of the comparison string is 28, Exim assumes that it is base64 encoded.
-If the length is 40, Exim assumes that it is a hexadecimal encoding of the
+\@{sha1@}\ computes the SHA-1 digest of the first string, and expresses this as
+printable characters to compare with the remainder of the second string. If the
+length of the comparison string is 28, Exim assumes that it is base64 encoded.
+If the length is 40, Exim assumes that it is a hexadecimal encoding of the
SHA-1 digest. If the length is not 28 or 40, the comparison fails.
.nextp
.index \*crypt()*\
-\@{crypt@}\ calls the \*crypt()*\ function, which uses only the first eight
+\@{crypt@}\ calls the \*crypt()*\ function, which uses only the first eight
characters of the password.
.nextp
.index \*crypt16()*\
@@ -8731,8 +8685,8 @@
Exim has its own version of \*crypt16()*\ (which is just a double call to
\*crypt()*\). For operating systems that have their own version, setting
\\HAVE@_CRYPT16\\ in \(Local/Makefile)\ when building Exim causes it to use the
-operating system version instead of its own. This option is set by default in
-the OS-dependent \(Makefile)\ for those operating systems that are known to
+operating system version instead of its own. This option is set by default in
+the OS-dependent \(Makefile)\ for those operating systems that are known to
support \*crypt16()*\.

If you do not put any curly bracket encryption type in a \crypteq\ comparison,
@@ -8774,7 +8728,7 @@
.index string||comparison
.index expansion||string comparison
The two substrings are first expanded. The condition is true if the two
-resulting strings are identical: for \eq\ the comparison includes the case of
+resulting strings are identical: for \eq\ the comparison includes the case of
letters, whereas for \eqi\ the comparison is case-independent.

.item "exists @{<<file name>>@}"
@@ -8792,7 +8746,6 @@
This condition, which has no data, is true during a message's first delivery
attempt. It is false during any subsequent delivery attempts.

-.em
.item "ge @{<<string1>>@}@{<<string2>>@}"
.item "gei @{<<string1>>@}@{<<string2>>@}"
.index string||comparison
@@ -8810,18 +8763,17 @@
string is lexically greater than the second string: for \gt\ the comparison
includes the case of letters, whereas for \gti\ the comparison is
case-independent.
-.nem

.item "isip @{<<string>>@}" 8
.item "isip4 @{<<string>>@}"
.item "isip6 @{<<string>>@}"
.index IP address||testing string format
.index string||testing for IP address
-The substring is first expanded, and then tested to see if it has the form of
-an IP address. Both IPv4 and IPv6 addresses are valid for \isip\, whereas
-\isip4\ and \isip6\ test just for IPv4 or IPv6 addresses, respectively. For
+The substring is first expanded, and then tested to see if it has the form of
+an IP address. Both IPv4 and IPv6 addresses are valid for \isip\, whereas
+\isip4\ and \isip6\ test just for IPv4 or IPv6 addresses, respectively. For
example, you could use
-.display asis
+.display asis
${if isip4{$sender_host_address}...
.endd
to test which version of IP an incoming SMTP connection is using.
@@ -8835,14 +8787,13 @@
use, the query must contain a user name and password. The query itself is not
used, and can be empty. The condition is true if
the password is not empty, and the user name and password are accepted by the
-LDAP server. An empty password is rejected without calling LDAP because LDAP
+LDAP server. An empty password is rejected without calling LDAP because LDAP
binds with an empty password are considered anonymous regardless of
the username, and will succeed in most configurations.
See chapter ~~CHAPSMTPAUTH for details of SMTP authentication, and chapter
~~CHAPplaintext for an example of how this can be used.


-.em
.item "le @{<<string1>>@}@{<<string2>>@}"
.item "lei @{<<string1>>@}@{<<string2>>@}"
.index string||comparison
@@ -8860,7 +8811,6 @@
string is lexically less than the second string: for \lt\ the comparison
includes the case of letters, whereas for \lti\ the comparison is
case-independent.
-.nem


.item "match @{<<string1>>@}@{<<string2>>@}"
@@ -8880,14 +8830,12 @@
If the whole expansion string is in double quotes, further escaping of
backslashes is also required.

-The condition is true if the regular expression match succeeds.
-.em
-The regular expression is not required to begin with a circumflex
+The condition is true if the regular expression match succeeds.
+The regular expression is not required to begin with a circumflex
metacharacter, but if there is no circumflex, the expression is not anchored,
-and it may match anywhere in the subject, not just at the start. If you want
-the pattern to match at the end of the subject, you must include the \"@$"\
+and it may match anywhere in the subject, not just at the start. If you want
+the pattern to match at the end of the subject, you must include the \"@$"\
metacharacter at an appropriate point.
-.nem

.index numerical variables (\$1$\, \$2$\, etc)||in \if\ expansion
At the start of an \if\ expansion the values of the numeric variable
@@ -8898,7 +8846,6 @@
combination of conditions using \or\, the subsequent values of the numeric
variables are those of the condition that succeeded.

-.em
.item "match@_domain @{<<string1>>@}@{<<string2>>@}"
.item "match@_address @{<<string1>>@}@{<<string2>>@}"
.item "match@_local@_part @{<<string1>>@}@{<<string2>>@}"
@@ -8928,7 +8875,6 @@
hosts have two identities: a name and an IP address, and it is not clear
how to specify cleanly how such a test would work. At least, I haven't come
up with anything yet.
-.nem

.item "pam {<<string1>>:<<string2>>:...@}"
.index PAM authentication
@@ -8948,7 +8894,7 @@
in some releases of GNU/Linux \-ldl-\ is also needed.

The argument string is first expanded, and the result must be a colon-separated
-list of strings.
+list of strings.
Leading and trailing whitespace is ignored.
The PAM module is initialized with the service name `exim' and the user name
taken from the first item in the colon-separated data string (<<string1>>). The
@@ -9019,7 +8965,7 @@
Radius authentication (RFC 2865) is supported in a similar way to PAM. You must
set \\RADIUS@_CONFIG@_FILE\\ in \(Local/Makefile)\ to specify the location of
the Radius client configuration file in order to build Exim with Radius
-support.
+support.
You may also have to supply a suitable setting in \\EXTRALIBS\\ so that the
Radius library can be found when Exim is linked.
The string specified by \\RADIUS@_CONFIG@_FILE\\ is expanded and passed to the
@@ -9118,12 +9064,12 @@
matching condition.

.tempindent 0
-\$acl@_c0$\ -- \$acl@_c9$\: Values can be placed in these variables by the
+\$acl@_c0$\ -- \$acl@_c9$\: Values can be placed in these variables by the
\set\ modifier in an ACL. The values persist throughout the lifetime of an SMTP
connection. They can be used to pass information between ACLs and different
-invocations of the same ACL.
+invocations of the same ACL.
When a message is received, the values of these variables are saved with the
-message, and can be accessed by filters, routers, and transports during
+message, and can be accessed by filters, routers, and transports during
subsequent delivery.

.tempindent 0
@@ -9137,7 +9083,7 @@


.tempindent 0
-\$acl@_verify@_message$\: During the expansion of the \message\ and
+\$acl@_verify@_message$\: During the expansion of the \message\ and
\log@_message\ modifiers in an ACL statement after an address verification has
failed, this variable contains the original failure message that will be
overridden by the expanded string.
@@ -9147,13 +9093,13 @@
option in routers. The value then remains with the address while it is
processed by subsequent routers and eventually a transport. If the transport is
handling multiple addresses, the value from the first address is used. See
-chapter ~~CHAProutergeneric for more details.
+chapter ~~CHAProutergeneric for more details.
\**Note**\: the contents of \$address@_data$\ are visible in user filter files.

If \$address@_data$\ is set when the routers are called to verify an address
from an ACL, the final value remains available in subsequent conditions in the
-ACL statement. If routing the address caused it to be redirected to a single
-address, the child address is also routed as part of the verification, and in
+ACL statement. If routing the address caused it to be redirected to a single
+address, the child address is also routed as part of the verification, and in
this case the final value of \$address@_data$\ is from the child's routing.

.tempindent 0
@@ -9168,8 +9114,8 @@
then when the \%address@_file%\ transport is running, \$address@_file$\
contains `/home/r2d2/savemail'.
.index Sieve filter||value of \$address@_file$\
-For Sieve filters, the value may be `inbox' or a relative folder name. It is
-then up to the transport configuration to generate an appropriate absolute path
+For Sieve filters, the value may be `inbox' or a relative folder name. It is
+then up to the transport configuration to generate an appropriate absolute path
to the relevant file.


@@ -9193,10 +9139,8 @@
.index \\AUTH\\||on \\MAIL\\ command
.tempindent 0
\$authenticated@_sender$\:
-.em
When acting as a server, Exim takes note of the \\AUTH=\\ parameter on an
incoming SMTP \\MAIL\\ command
-.nem
if it believes the sender is sufficiently trusted, as described in section
~~SECTauthparamail. Unless the data is the string `@<@>', it is set as the
authenticated sender of the message, and the value is available during delivery
@@ -9210,7 +9154,7 @@

.index authentication||failure
.tempindent 0
-\$authentication@_failed$\:
+\$authentication@_failed$\:
This variable is set to `1' in an Exim server if a client issues an \\AUTH\\
command that does not succeed. Otherwise it is set to `0'. This makes it
possible to distinguish between `did not try to authenticate'
@@ -9232,11 +9176,9 @@
.index body of message||binary zero count
.index binary zero||in message body
.tempindent 0
-.em
\$body@_zerocount$\:
When a message is being received or delivered, this variable contains the
number of binary zero bytes in the message's body.
-.nem

.tempindent 0
\$bounce@_recipient$\:
@@ -9252,10 +9194,8 @@

.index gid (group id)||caller
.tempindent 0
-\$caller@_gid$\: The
-.em
-real
-.nem
+\$caller@_gid$\: The
+real
group id under which the process that called Exim was
running. This is not the same as the group id of the originator of a message
(see \$originator@_gid$\). If Exim re-execs itself, this variable in the new
@@ -9263,10 +9203,8 @@

.index uid (user id)||caller
.tempindent 0
-\$caller@_uid$\: The
-.em
+\$caller@_uid$\: The
real
-.nem
user id under which the process that called Exim was
running. This is not the same as the user id of the originator of a message
(see \$originator@_uid$\). If Exim re-execs itself, this variable in the new
@@ -9293,7 +9231,7 @@
.tempindent 0
\$dnslist@_value$\: When a client host is found to be on a DNS (black) list,
the IP address from the resource record is placed in this variable.
-If there are multiple records, all the addresses are included, comma-space
+If there are multiple records, all the addresses are included, comma-space
separated.

.tempindent 0
@@ -9319,8 +9257,8 @@
.numberpars $.
When an ACL is running for a \\RCPT\\ command, \$domain$\ contains the domain
of the recipient address.
-\**Note:**\ the domain of the sender address is in \$sender@_address@_domain$\
-at \\MAIL\\ time and at \\RCPT\\ time. \$domain$\ is not set for the \\MAIL\\
+\**Note:**\ the domain of the sender address is in \$sender@_address@_domain$\
+at \\MAIL\\ time and at \\RCPT\\ time. \$domain$\ is not set for the \\MAIL\\
ACL.
.nextp
When a rewrite item is being processed (see chapter ~~CHAPrewrite), \$domain$\
@@ -9347,14 +9285,13 @@
of the router as \$domain@_data$\. In addition, if the driver routes the
address to a transport, the value is available in that transport. If the
transport is handling multiple addresses, the value from the first address is
-used.
+used.

-\$domain@_data$\ is also set when the \domains\ condition in an ACL matches a
-domain by means of a lookup. The data read by the lookup is available during
+\$domain@_data$\ is also set when the \domains\ condition in an ACL matches a
+domain by means of a lookup. The data read by the lookup is available during
the rest of the ACL statement. In all other situations, this variable expands
to nothing.

-.em
.tempindent 0
\$exim@_gid$\: This variable contains the numerical value of the Exim group id.

@@ -9363,7 +9300,6 @@

.tempindent 0
\$exim@_uid$\: This variable contains the numerical value of the Exim user id.
-.nem

.tempindent 0
\$header@_<<name>>$\: This is not strictly an expansion variable. It is
@@ -9418,14 +9354,12 @@
This variable contains `1' if the message came from a remote host and there was
an attempt to look up the host's name from its IP address, but the attempt
failed. Otherwise the value of the variable is `0'.
-.em
Exim checks that a forward lookup of at least one of the names it receives from
-a reverse lookup yields the original IP address. If this is not the case, Exim
-does not accept the looked up name(s), and \$host@_lookup@_failed$\ is set to
-`1'. Thus, being able to find a name from an IP address (for example, the
-existence of a PTR record in the DNS) is not sufficient on its own for the
+a reverse lookup yields the original IP address. If this is not the case, Exim
+does not accept the looked up name(s), and \$host@_lookup@_failed$\ is set to
+`1'. Thus, being able to find a name from an IP address (for example, the
+existence of a PTR record in the DNS) is not sufficient on its own for the
success of a host name lookup.
-.nem

.tempindent 0
\$inode$\:
@@ -9438,27 +9372,27 @@
\$interface@_address$\:
When a message is received over a TCP/IP connection, this variable contains the
address of the local IP interface. See also the \-oMi-\ command line option.
-This variable can be used in ACLs and also, for example, to make the file name
+This variable can be used in ACLs and also, for example, to make the file name
for a TLS certificate depend on which interface is being used.

.tempindent 0
\$interface@_port$\:
When a message is received over a TCP/IP connection, this variable contains the
local port number. See also the \-oMi-\ command line option.
-This variable can be used in ACLs and also, for example, to make the file name
+This variable can be used in ACLs and also, for example, to make the file name
for a TLS certificate depend on which port is being used.

.tempindent 0
\$ldap@_dn$\:
-This variable, which is available only when Exim is compiled with LDAP support,
-contains the DN from the last entry in the most recently successful LDAP
+This variable, which is available only when Exim is compiled with LDAP support,
+contains the DN from the last entry in the most recently successful LDAP
lookup.


.tempindent 0
\$load@_average$\:
-This variable contains the system load average, multiplied by 1000 to that it
-is an integer. For example, if the load average is 0.21, the value of the
+This variable contains the system load average, multiplied by 1000 to that it
+is an integer. For example, if the load average is 0.21, the value of the
variable is 210. The value is recomputed every time the variable is referenced.

.tempindent 0
@@ -9505,11 +9439,9 @@
.display asis
data = ${quote_local_part:$local_part}@???
.endd
-.em
-\**Note**\: The value of \$local@_part$\ is normally lower cased. If you want
-to process local parts in a case-dependent manner in a router, you can set the
+\**Note**\: The value of \$local@_part$\ is normally lower cased. If you want
+to process local parts in a case-dependent manner in a router, you can set the
\caseful@_local@_part\ option (see chapter ~~CHAProutergeneric).
-.nem

.tempindent 0
\$local@_part@_data$\:
@@ -9558,9 +9490,9 @@
been read.

.tempindent 0
-\$mailstore@_basename$\: This variable is set only when doing deliveries in
-`mailstore' format in the \%appendfile%\ transport. During the expansion of the
-\mailstore@_prefix\, \mailstore@_suffix\, \message__prefix\, and
+\$mailstore@_basename$\: This variable is set only when doing deliveries in
+`mailstore' format in the \%appendfile%\ transport. During the expansion of the
+\mailstore@_prefix\, \mailstore@_suffix\, \message__prefix\, and
\message@_suffix\ options, it contains the basename of the files that are being
written, that is, the name without the `.tmp', `.env', or `.msg' suffix. At all
other times, this variable is empty.
@@ -9605,21 +9537,19 @@
lines are separated by newline characters.

.tempindent 0
-\$message@_id$\:
+\$message@_id$\:
When a message is being received or delivered, this variable contains the
unique message id that is used by Exim to identify the message.
-An id is not created for a message until after its header has been
+An id is not created for a message until after its header has been
successfully received.
-.em
-\**Note**\: This is \*not*\ the contents of the ::Message-ID:: header line; it
-is the local id that Exim assigns to the message, for example:
+\**Note**\: This is \*not*\ the contents of the ::Message-ID:: header line; it
+is the local id that Exim assigns to the message, for example:
\"1BXTIK-0001yO-VA"\.
-.nem

.index size||of message
.index message||size
.tempindent 0
-\$message@_size$\:
+\$message@_size$\:
When a message is being processed, this variable contains its size in bytes. In
most cases, the size includes those headers that were received with the
message, but not those (such as ::Envelope-to::) that are added to individual
@@ -9631,7 +9561,7 @@

.index \\RCPT\\||value of \$message@_size$\
While running an ACL at the time of an SMTP \\RCPT\\ command, \$message@_size$\
-contains the size supplied on the \\MAIL\\ command, or
+contains the size supplied on the \\MAIL\\ command, or
-1
if no size was given. The value may not, of course, be truthful.

@@ -9713,9 +9643,7 @@
\*uname()*\ function. If \*uname()*\ returns a single-component name, Exim
calls \*gethostbyname()*\ (or \*getipnodebyname()*\ where available) in an
attempt to acquire a fully qualified host name.
-.em
See also \$smtp@_active@_hostname$\.
-.nem

.tempindent 0
\$qualify@_domain$\: The value set for this option in the configuration file.
@@ -9725,13 +9653,13 @@
or if not set, the value of \$qualify@_domain$\.

.tempindent 0
-\$rcpt@_count$\: When a message is being received by SMTP, this variable
+\$rcpt@_count$\: When a message is being received by SMTP, this variable
contains the number of \\RCPT\\ commands received for the current message. If
this variable is used in a \\RCPT\\ ACL, its value includes the current
command.

.tempindent 0
-\$rcpt@_defer@_count$\: When a message is being received by SMTP, this variable
+\$rcpt@_defer@_count$\: When a message is being received by SMTP, this variable
contains the number of \\RCPT\\ commands in the current message that have
previously been rejected with a temporary (4\*xx*\) response.

@@ -9750,17 +9678,14 @@
\$received@_for$\: If there is only a single recipient address in an incoming
message, this variable contains that address when the ::Received:: header line
is being built.
-.em
The value is copied after recipient rewriting has happened, but before the
\*local@_scan()*\ function is run.
-.nem

.tempindent 0
\$received@_protocol$\: When a message is being processed, this variable
contains the name of the protocol by which it was received. See also the
\-oMr-\ option.

  -.em
   .tempindent 0
   \$recipient@_data$\: This variable is set after an indexing lookup success in
   an ACL \recipients\ condition. It contains the data from the lookup, and the
  @@ -9770,11 +9695,10 @@
   require recipients      = cdb*@@;/some/file
   deny    \*some further test involving*\ @$recipient@_data
   .endd
  -\**Warning**\: This variable is set only when a lookup is used as an indexing 
  +\**Warning**\: This variable is set only when a lookup is used as an indexing
   method in the address list, using the semicolon syntax as in the example above.
   The variable is not set for a lookup that is used as part of the string
   expansion that all such lists undergo before being interpreted.
  -.nem


.tempindent 0
\$recipients$\: This variable contains a list of envelope recipients for a
@@ -9784,7 +9708,7 @@
.numberpars
In a system filter file.
.nextp
-In the \\DATA\\ or non-SMTP ACL, that is, in the final ACL for accepting a
+In the \\DATA\\ or non-SMTP ACL, that is, in the final ACL for accepting a
message.
.endp

@@ -9804,14 +9728,14 @@
.tempindent 0
\$return@_path$\: When a message is being delivered, this variable contains the
return path -- the sender field that will be sent as part of the envelope. It
-is not enclosed in @<@> characters.
-At the start of routing an address,
+is not enclosed in @<@> characters.
+At the start of routing an address,
\$return@_path$\ has the same value as \$sender@_address$\, but if, for
example, an incoming message to a mailing list has been expanded by a router
which specifies a different address for bounce messages, \$return@_path$\
subsequently contains the new bounce address, whereas \$sender@_address$\
always contains the original sender address that was received with the message.
-In other words, \$sender@_address$\ contains the incoming envelope sender, and
+In other words, \$sender@_address$\ contains the incoming envelope sender, and
\$return@_path$\ contains the outgoing envelope sender.

.tempindent 0
@@ -9822,14 +9746,14 @@
.tempindent 0
\$runrc$\: This variable contains the return code from a command that is run by
the \@$@{run...@}\ expansion item.
-\**Warning**\: In a router or transport, you cannot assume the order in which
-option values are expanded, except for those pre-conditions whose order of
-testing is documented. Therefore, you cannot reliably expect to set \$runrc$\
+\**Warning**\: In a router or transport, you cannot assume the order in which
+option values are expanded, except for those pre-conditions whose order of
+testing is documented. Therefore, you cannot reliably expect to set \$runrc$\
by the expansion of one option, and use it in another.

.tempindent 0
\$self@_hostname$\: When an address is routed to a supposedly remote host that
-turns out to be the local host, what happens is controlled by the
+turns out to be the local host, what happens is controlled by the
.index \self\ option||value of host name
\self\ generic router option. One of its values causes the address to be passed
to another router. When this happens, \$self@_hostname$\ is set to the name of
@@ -9848,9 +9772,8 @@
.tempindent 0
\$sender@_address@_local@_part$\: The local part portion of \$sender@_address$\.

  -.em
   .tempindent 0
  -\$sender@_data$\: This variable is set after a lookup success in an ACL 
  +\$sender@_data$\: This variable is set after a lookup success in an ACL
   \senders\ condition or in a router \senders\ option. It contains the data from
   the lookup, and the value remains set until the next \senders\ test. Thus, you
   can do things like this:
  @@ -9858,11 +9781,10 @@
   require senders      = cdb*@@;/some/file
   deny    \*some further test involving*\ @$sender@_data
   .endd
  -\**Warning**\: This variable is set only when a lookup is used as an indexing 
  +\**Warning**\: This variable is set only when a lookup is used as an indexing
   method in the address list, using the semicolon syntax as in the example above.
   The variable is not set for a lookup that is used as part of the string
   expansion that all such lists undergo before being interpreted.
  -.nem


.tempindent 0
\$sender@_fullhost$\: When a message is received from a remote host, this
@@ -9897,18 +9819,16 @@

.tempindent 0
\$sender@_host@_name$\: When a message is received from a remote host, this
-variable contains the host's name as obtained by looking up its IP address.
+variable contains the host's name as obtained by looking up its IP address.
For messages received by other means, this variable is empty.

If the host name has not previously been looked up, a reference to
-\$sender@_host@_name$\ triggers a lookup (for messages from remote hosts).
-.em
+\$sender@_host@_name$\ triggers a lookup (for messages from remote hosts).
A looked up name is accepted only if it leads back to the original IP address
via a forward lookup. If either the reverse or the forward lookup fails, or if
the forward lookup does not yield the original IP address,
\$sender@_host@_name$\ remains empty, and \$host@_lookup@_failed$\ is set to
`1'.
-.nem

Exim does not automatically look up every calling host's name. If you want
maximum efficiency, you should arrange your configuration so that it avoids
@@ -9917,7 +9837,7 @@
.numberpars
A string containing \$sender@_host@_name$\ is expanded.
.nextp
-The calling host matches the list in \host@_lookup\. In the default
+The calling host matches the list in \host@_lookup\. In the default
configuration, this option is set to $*$, so it must be changed if lookups are
to be avoided. (In the code, the default for \host@_lookup\ is unset.)
.nextp
@@ -9925,16 +9845,16 @@
that require this are described in sections ~~SECThoslispatnam and
~~SECThoslispatnamsk.
.nextp
-The calling host matches \helo@_try@_verify@_hosts\ or \helo@_verify@_hosts\.
-In this case, the host name is required to compare with the name quoted in any
+The calling host matches \helo@_try@_verify@_hosts\ or \helo@_verify@_hosts\.
+In this case, the host name is required to compare with the name quoted in any
\\EHLO\\ or \\HELO\\ commands that the client issues.
.nextp
-The remote host issues a \\EHLO\\ or \\HELO\\ command that quotes one of the
-domains in \helo@_lookup@_domains\. The default value of this option is
+The remote host issues a \\EHLO\\ or \\HELO\\ command that quotes one of the
+domains in \helo@_lookup@_domains\. The default value of this option is
.display asis
helo_lookup_domains = @ : @[]
.endd
-which causes a lookup if a remote host (incorrectly) gives the server's name or
+which causes a lookup if a remote host (incorrectly) gives the server's name or
IP address in an \\EHLO\\ or \\HELO\\ command.
.endp

@@ -9998,14 +9918,14 @@
.tempindent 0
\$tls@_cipher$\: When a message is received from a remote host over an
encrypted SMTP connection, this variable is set to the cipher suite that was
-negotiated, for example DES-CBC3-SHA.
-In other circumstances, in particular, for message received over unencrypted
+negotiated, for example DES-CBC3-SHA.
+In other circumstances, in particular, for message received over unencrypted
connections, the variable is empty.
See chapter ~~CHAPTLS for details of TLS support.

.tempindent 0
\$tls@_peerdn$\: When a message is received from a remote host over an
-encrypted SMTP connection,
+encrypted SMTP connection,
and Exim is configured to request a certificate from the client,
the value of the Distinguished Name of the certificate is made available in the
\$tls@_peerdn$\ during subsequent processing.
@@ -10021,7 +9941,7 @@
.tempindent 0
\$tod@_full$\: A full version of the time and date, for example: Wed, 16 Oct
1995 09:51:40 +0100. The timezone is always given as a numerical offset from
-UTC, with positive values used for timezones that are ahead (east) of UTC, and
+UTC, with positive values used for timezones that are ahead (east) of UTC, and
negative values for those that are behind (west).

.tempindent 0
@@ -10213,7 +10133,7 @@
standard SMTP port, you should not need to take any special action. The
rest of this chapter does not apply to you.

  -In a more complicated situation you may want to listen only on certain 
  +In a more complicated situation you may want to listen only on certain
   interfaces, or on different ports, and for this reason there are a number of
   options that can be used to influence Exim's behaviour. The rest of this
   chapter describes how they operate.
  @@ -10242,23 +10162,23 @@
                         192.168.23.65 ; \
                         ::1 ; \
                         3ffe:ffff:836f::fe86:a061
  -.endd              
  +.endd
   There are two different formats for specifying a port along with an IP address
   in \local@_interfaces\:
   .numberpars
  -The port is added onto the address with a dot separator. For example, to listen 
  +The port is added onto the address with a dot separator. For example, to listen
   on port 1234 on two different IP addresses:
   .display asis
   local_interfaces = <; 192.168.23.65.1234 ; \
                         3ffe:ffff:836f::fe86:a061.1234
  -.endd                       
  +.endd
   .nextp
   The IP address is enclosed in square brackets, and the port is added
   with a colon separator, for example:
   .display asis
   local_interfaces = <; [192.168.23.65]:1234 ; \
                         [3ffe:ffff:836f::fe86:a061]:1234
  -.endd                       
  +.endd
   .endp
   When a port is not specified, the value of \daemon@_smtp@_ports\ is used. The
   default setting contains just one port:
  @@ -10272,7 +10192,7 @@
   IP addresses in \local@_interfaces\, only numbers (not names) can be used.



-.section Special IP listening addresses
+.section Special IP listening addresses
The addresses 0.0.0.0 and @:@:0 are treated specially. They are interpreted
as `all IPv4 interfaces' and `all IPv6 interfaces', respectively. In each
case, Exim tells the TCP/IP stack to `listen on all IPv\*x*\ interfaces'
@@ -10403,8 +10323,8 @@
address, but all available interface addresses are treated as local when
Exim is routing.

  -In some environments the local host name may be in an MX list, but with an IP 
  -address that is not assigned to any local interface. In other cases it may be 
  +In some environments the local host name may be in an MX list, but with an IP
  +address that is not assigned to any local interface. In other cases it may be
   desirable to treat other host names as if they referred to the local host. Both
   these cases can be handled by setting the \hosts@_treat@_as@_local\ option.
   This contains host names rather than IP addresses. When a host is referenced
  @@ -10503,17 +10423,15 @@
   \log@_selector\                         $t$rm{set/unset optional logging}
   \log@_timezone\                         $t$rm{add timezone to log lines}
   \message@_logs\                         $t$rm{create per-message logs}
  -\preserve@_message@_logs\               $t$rm{in another directory after message completion}
  +\preserve@_message@_logs\               $t$rm{after message completion}
   \process@_log@_path\                    $t$rm{for SIGUSR1 and \*exiwhat*\}
   \syslog@_duplication\                   $t$rm{controls duplicate log lines on syslog }
   \syslog@_facility\                      $t$rm{set syslog `facility' field}
   \syslog@_processname\                   $t$rm{set syslog `ident' field}
   \syslog@_timestamp\                     $t$rm{timestamp syslog lines}
   .newline
  -.em
   \write@_rejectlog\                      $t$rm{control use of message log}
   .newline
  -.nem
   .endd


   .section Frozen messages
  @@ -10557,7 +10475,7 @@
   \extra@_local@_interfaces\              $t$rm{not necessarily listened on}
   \local@_interfaces\                     $t$rm{on which to listen, with optional ports}
   \pid@_file@_path\                       $t$rm{override compiled-in value}
  -\queue@_run@_max\                       $t$rm{maximum number of simultaneous queue runners}
  +\queue@_run@_max\                       $t$rm{maximum simultaneous queue runners}
   .endd


   .section Resource control
  @@ -10569,7 +10487,7 @@
   \check@_spool@_space\                   $t$rm{before accepting a message}
   \deliver@_queue@_load@_max\             $t$rm{no queue deliveries if load high}
   \queue@_only@_load\                     $t$rm{queue incoming if load high}
  -\queue@_run@_max\                       $t$rm{maximum number of simultaneous queue runners}
  +\queue@_run@_max\                       $t$rm{maximum simultaneous queue runners}
   \remote@_max@_parallel\                 $t$rm{parallel SMTP delivery per message}
   \smtp@_accept@_max\                     $t$rm{simultaneous incoming connections}
   \smtp@_accept@_max@_nommail\            $t$rm{non-mail commands}
  @@ -10632,24 +10550,20 @@
   \tls@_advertise@_hosts\                 $t$rm{advertise TLS to these hosts}
   \tls@_certificate\                      $t$rm{location of server certificate}
   .newline
  -.em
   \tls@_crl\                              $t$rm{certificate revocation list}
   .newline
  -.nem
   \tls@_dhparam\                          $t$rm{DH parameters for server}
   \tls@_privatekey\                       $t$rm{location of server private key}
   \tls@_remember@_esmtp\                  $t$rm{don't reset after starting TLS}
   .newline
  -.em
   \tls@_require@_ciphers\                 $t$rm{specify acceptable cipers}
   .newline
  -.nem
   \tls@_try@_verify@_hosts\               $t$rm{try to verify client certificate}
   \tls@_verify@_certificates\             $t$rm{expected client certificates}
   \tls@_verify@_hosts\                    $t$rm{insist on client certificate verify}
   .endd


  -.section Local user handling 
  +.section Local user handling
   .display flow rm
   .tabs 31
   \finduser@_retries\                     $t$rm{useful in NIS environments}
  @@ -10704,10 +10618,8 @@
   \smtp@_accept@_queue@_per@_connection\  $t$rm{queue if more messages per connection}
   \smtp@_accept@_reserve\                 $t$rm{only reserve hosts if more connections}
   .newline
  -.em
   \smtp@_active@_hostname\                $t$rm{host name to use in messages}
   .newline
  -.nem
   \smtp@_banner\                          $t$rm{text for welcome banner}
   \smtp@_check@_spool@_space\             $t$rm{from \\SIZE\\ on \\MAIL\\ command}
   \smtp@_connect@_backlog\                $t$rm{passed to TCP/IP stack}
  @@ -10783,7 +10695,7 @@
   \queue@_run@_in@_order\                 $t$rm{order of arrival}
   \queue@_run@_max\                       $t$rm{of simultaneous queue runners}
   \queue@_smtp@_domains\                  $t$rm{no immediate SMTP delivery for these}
  -\remote@_max@_parallel\                 $t$rm{parallel SMTP delivery (per message, not overall)}
  +\remote@_max@_parallel\                 $t$rm{parallel SMTP delivery per message}
   \remote@_sort@_domains\                 $t$rm{order of remote deliveries}
   \retry@_data@_expire\                   $t$rm{timeout for retry data}
   \retry@_interval@_max\                  $t$rm{safety net for retry rules}
  @@ -10828,10 +10740,10 @@
   .index ~~ACL||for non-SMTP messages
   .index non-SMTP messages, ACL for
   .conf acl@_not@_smtp string$**$ unset
  -This option defines the ACL that is run when a non-SMTP message is on the point 
  +This option defines the ACL that is run when a non-SMTP message is on the point
   of being accepted. See chapter ~~CHAPACL for further details.


-.index ~~ACL||on SMTP connection
+.index ~~ACL||on SMTP connection
.conf acl@_smtp@_connect string$**$ unset
This option defines the ACL that is run when an SMTP connection is received.
See chapter ~~CHAPACL for further details.
@@ -10871,7 +10783,7 @@

.index \\AUTH\\||on \\MAIL\\ command
.conf acl@_smtp@_mailauth string$**$ unset
-This option defines the ACL that is run when there is an \\AUTH\\ parameter on
+This option defines the ACL that is run when there is an \\AUTH\\ parameter on
a \\MAIL\\ command. See chapter ~~CHAPACL for details of ACLs, and chapter
~~CHAPSMTPAUTH for details of authentication.

@@ -10906,12 +10818,12 @@
format is not normally required these days, and few people know about it. It
has, however, been exploited by mail abusers.

-Unfortunately, it seems that some DNS black list maintainers are using this
-format to report black listing to postmasters. If you want to accept messages
-addressed to your hosts by IP address, you need to set
-\allow@_domain@_literals\ true, and also to add \"@@[]"\ to the list of local
-domains (defined in the named domain list \local@_domains\ in the default
-configuration). This `magic string' matches the domain literal form of all the
+Unfortunately, it seems that some DNS black list maintainers are using this
+format to report black listing to postmasters. If you want to accept messages
+addressed to your hosts by IP address, you need to set
+\allow@_domain@_literals\ true, and also to add \"@@[]"\ to the list of local
+domains (defined in the named domain list \local@_domains\ in the default
+configuration). This `magic string' matches the domain literal form of all the
local host's IP addresses.

.conf allow@_mx@_to@_ip boolean false
@@ -10929,7 +10841,7 @@
.conf allow@_utf8@_domains boolean false
Lots of discussion is going on about internationalized domain names. One
camp is strongly in favour of just using UTF-8 characters, and it seems
-that at least two other MTAs permit this. This option allows Exim users to
+that at least two other MTAs permit this. This option allows Exim users to
experiment if they wish.

If it is set true, Exim's domain parsing function allows valid
@@ -10954,10 +10866,10 @@
If any server authentication mechanisms are configured, Exim advertises them in
response to an \\EHLO\\ command only if the calling host matches this list.
Otherwise, Exim does not advertise \\AUTH\\.
-Exim does not accept \\AUTH\\ commands from clients to which it has not
-advertised the availability of \\AUTH\\. The advertising of individual
+Exim does not accept \\AUTH\\ commands from clients to which it has not
+advertised the availability of \\AUTH\\. The advertising of individual
authentication mechanisms can be controlled by the use of the
-\server@_advertise@_condition\ generic authenticator option on the individual
+\server@_advertise@_condition\ generic authenticator option on the individual
authenticators. See chapter ~~CHAPSMTPAUTH for further details.

Certain mail clients (for example, Netscape) require the user to provide a name
@@ -10974,8 +10886,8 @@
.display asis
auth_advertise_hosts = ${if eq{$tls_cipher}{}{}{*}}
.endd
-If \$tls@_cipher$\ is empty, the session is not encrypted, and the result of
-the expansion is empty, thus matching no hosts. Otherwise, the result of the
+If \$tls@_cipher$\ is empty, the session is not encrypted, and the result of
+the expansion is empty, thus matching no hosts. Otherwise, the result of the
expansion is $*$, which matches all hosts.

.conf auto@_thaw time 0s
@@ -11009,8 +10921,8 @@

.index bounce message||including body
.conf bounce@_return@_body boolean true
-This option controls whether the body of an incoming message is included in a
-bounce message when \bounce@_return@_message\ is true. If it is not set, only
+This option controls whether the body of an incoming message is included in a
+bounce message when \bounce@_return@_message\ is true. If it is not set, only
the message header is included.

.index bounce message||including original
@@ -11075,7 +10987,7 @@
section ~~SECTcallvercache for details of the caching.

.conf callout@_random@_local@_part string$**$ "see below"
-This option defines the `random' local part that can be used as part of callout
+This option defines the `random' local part that can be used as part of callout
verification. The default value is
.display asis
$primary_host_name-$tod_epoch-testing
@@ -11128,7 +11040,7 @@
.index TCP/IP||setting listening ports
.conf daemon@_smtp@_ports string "$tt{smtp}"
This option specifies one or more default SMTP ports on which the Exim daemon
-listens. See chapter ~~CHAPinterfaces for details of how it is used. For
+listens. See chapter ~~CHAPinterfaces for details of how it is used. For
backward compatibility, \daemon@_smtp@_port\ (singular) is a synonym.

.conf delay@_warning "time list" 24h
@@ -11144,8 +11056,8 @@
delay_warning = 4h:8h:24h
.endd
the first message is sent after 4 hours, the second after 8 hours, and
-the third one after 24 hours. After that, messages are sent every 16 hours,
-because that is the interval between the last two times on the list. If you set
+the third one after 24 hours. After that, messages are sent every 16 hours,
+because that is the interval between the last two times on the list. If you set
just one time, it specifies the repeat interval. For example, with:
.display asis
delay_warning = 6h
@@ -11205,12 +11117,10 @@
for a long time. If a domain which exhibits this problem matches anything in
\dns__again__means__nonexist\, it is treated as if it did not exist. This
option should be used with care.
-.em
You can make it apply to reverse lookups by a setting such as this:
.display asis
dns_again_means_nonexist = *.in-addr.arpa
.endd
-.nem

.index DNS||pre-check of name syntax
.conf dns@_check@_names@_pattern string "see below"
@@ -11226,7 +11136,7 @@
.endd
which permits only letters, digits, and hyphens in components, but they may not
start or end with a hyphen.
-If you set \allow@_utf8@_domains\, you must modify this pattern, or set the
+If you set \allow@_utf8@_domains\, you must modify this pattern, or set the
option to an empty string.

.conf dns@_ipv4@_lookup "domain list$**$" unset
@@ -11260,8 +11170,8 @@
See \dns@_retrans\ above.

.conf drop@_cr boolean false
-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
+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 ~~SECTlineendings.

   .conf envelope@_to@_remove boolean true
  @@ -11297,7 +11207,7 @@
   The address list is expanded before use. The expansion variables
   \$local@_part$\ and \$domain$\ are set from the original recipient of the error
   message, and if there was any wildcard matching in the pattern, the expansion
  -.index numerical variables (\$1$\, \$2$\, etc)||in \errors@_copy\        
  +.index numerical variables (\$1$\, \$2$\, etc)||in \errors@_copy\
   variables \$0$\, \$1$\, etc. are set in the normal way.


.conf errors@_reply@_to string unset
@@ -11306,7 +11216,7 @@
.display
From: Mail Delivery System @<Mailer-Daemon@@<<qualify-domain>>@>
.endd
-where <<qualify-domain>> is the value of the \qualify@_domain\ option.
+where <<qualify-domain>> is the value of the \qualify@_domain\ option.
Experience shows that people reply to bounce messages. If the
\errors@_reply@_to\ option is set, a ::Reply-To:: header is added to bounce and
warning messages. For example:
@@ -11333,9 +11243,9 @@
the directory configured at compile time by the \\BIN@_DIRECTORY\\ setting. It
is necessary to change \exim@_path\ if, exceptionally, Exim is run from some
other place.
-\**Warning**\: Do not use a macro to define the value of this option, because
-you will break those Exim utilities that scan the configuration file to find
-where the binary is. (They then use the \-bP-\ option to extract option
+\**Warning**\: Do not use a macro to define the value of this option, because
+you will break those Exim utilities that scan the configuration file to find
+where the binary is. (They then use the \-bP-\ option to extract option
settings such as the value of \spool@_directory\.)

.conf exim@_user string "compile-time configured"
@@ -11352,9 +11262,9 @@
used. See chapter ~~CHAPsecurity for a discussion of security issues.

.conf extra@_local@_interfaces "string list" unset
-.index
-This option defines network interfaces that are to be considered local when
-routing, but which are not used for listening by the daemon. See section
+.index
+This option defines network interfaces that are to be considered local when
+routing, but which are not used for listening by the daemon. See section
~~SECTreclocipadd for details.

.conf extract@_addresses@_remove@_arguments boolean true
@@ -11388,14 +11298,14 @@
Exim freezes a message. This means that no further delivery attempts take place
until an administrator (or the \auto@_thaw\ feature) thaws the message. If
\freeze@_tell\ is set, Exim generates a warning message whenever it freezes
-something, unless the message it is freezing is a
+something, unless the message it is freezing is a
locally-generated
bounce message. (Without this exception there is the possibility of looping.)
The warning message is sent to the addresses supplied as the comma-separated
value of this option. If several of the message's addresses cause freezing,
-only a single message is sent.
+only a single message is sent.
If the freezing was automatic, the reason(s) for freezing can be found in the
-message log. If you configure freezing in a filter or ACL, you must arrange for
+message log. If you configure freezing in a filter or ACL, you must arrange for
any logging that you require.

.conf gecos@_name string$**$ unset
@@ -11412,7 +11322,7 @@
When these options are set, \gecos@_pattern\ is treated as a regular expression
that is to be applied to the field (again with & replaced by the login name),
and if it matches, \gecos@_name\ is expanded and used as the user's name.
-.index numerical variables (\$1$\, \$2$\, etc)||in \gecos@_name\
+.index numerical variables (\$1$\, \$2$\, etc)||in \gecos@_name\
Numeric variables such as \$1$\, \$2$\, etc. can be used in the expansion to
pick up sub-fields that were matched by the pattern. In HP-UX, where the user's
name terminates at the first comma, the following can be used:
@@ -11437,11 +11347,11 @@
.index limit||size of message header section
This option controls the overall maximum size of a message's header
section. The default is the value of \\HEADER@_MAXSIZE\\ in
-\(Local/Makefile)\; the default for that is 1M. Messages with larger header
+\(Local/Makefile)\; the default for that is 1M. Messages with larger header
sections are rejected.

.conf header@_line@_maxsize integer 0
-.index header lines||maximum size of
+.index header lines||maximum size of
.index limit||size of one header line
This option limits the length of any individual header line in a message, after
all the continuations have been joined together. Messages with individual
@@ -11458,7 +11368,7 @@
some SMTP clients that send syntactic junk. They can be accommodated by setting
this option. Note that this is a syntax check only. See \helo@_verify@_hosts\
if you want to do semantic checking.
-See also \helo@_allow@_chars\ for a way of extending the permitted character
+See also \helo@_allow@_chars\ for a way of extending the permitted character
set.

.conf helo@_allow@_chars string unset
@@ -11503,7 +11413,7 @@
when looked up using \*gethostbyname()*\ (or \*getipnodebyname()*\ when
available) yields the calling host address.
.endp
-However, the \\EHLO\\ or \\HELO\\ command is not rejected if any of the checks
+However, the \\EHLO\\ or \\HELO\\ command is not rejected if any of the checks
fail. Processing continues, but the result of the check is remembered, and can
be detected later in an ACL by the \"verify = helo"\ condition. If you want
verification failure to cause rejection of \\EHLO\\ or \\HELO\\, use
@@ -11517,8 +11427,8 @@
\\HELO\\ or \\EHLO\\ in the same way as for \helo@_try@_verify@_hosts\. If the
check fails, the \\HELO\\ or \\EHLO\\ command is rejected with a 550 error, and
entries are written to the main and reject logs. If a \\MAIL\\ command is
-received before \\EHLO\\ or \\HELO\\, it is rejected with a
-503
+received before \\EHLO\\ or \\HELO\\, it is rejected with a
+503
error.

.conf hold@_domains "domain list$**$" unset
@@ -11566,13 +11476,13 @@

.conf host@_lookup@_order "string list" $tt{bydns:byaddr}
This option specifies the order of different lookup methods when Exim is trying
-to find a host name from an IP address. The default is to do a DNS lookup
+to find a host name from an IP address. The default is to do a DNS lookup
first, and then to try a local lookup (using \*gethostbyaddr()*\ or equivalent)
if that fails. You can change the order of these lookups, or omit one entirely,
if you want.

\**Warning**\: the `byaddr' method does not always yield aliases when there are
-multiple PTR records in the DNS and the IP address is not listed in
+multiple PTR records in the DNS and the IP address is not listed in
\(/etc/hosts)\. Different operating systems give different results in this
case. That is why the default tries a DNS lookup first.

@@ -11580,7 +11490,7 @@
.conf host@_reject@_connection "host list$**$" unset
.index host||rejecting connections from
If this option is set, incoming SMTP calls from the hosts listed are rejected
-as soon as the connection is made.
+as soon as the connection is made.
This option is obsolete, and retained only for backward compatibility, because
nowadays the ACL specified by \acl@_smtp@_connect\ can also reject incoming
connections immediately.
@@ -11605,15 +11515,15 @@
section ~~SECTdomainlist), and when checking the \hosts\ option in the \%smtp%\
transport for the local host (see the \allow@_localhost\ option in that
transport).
-See also \local@_interfaces\, \extra@_local@_interfaces\, and chapter
-~~CHAPinterfaces, which contains a discussion about local network interfaces
+See also \local@_interfaces\, \extra@_local@_interfaces\, and chapter
+~~CHAPinterfaces, which contains a discussion about local network interfaces
and recognising the local host.

.conf ignore@_bounce@_errors@_after time 10w
.index bounce message||discarding
.index discarding bounce message
-This option affects the processing of bounce messages that cannot be delivered,
-that is, those that suffer a permanent delivery failure. (Bounce messages that
+This option affects the processing of bounce messages that cannot be delivered,
+that is, those that suffer a permanent delivery failure. (Bounce messages that
suffer temporary delivery failures are of course retried in the usual way.)

After a permanent delivery failure, bounce messages are frozen,
@@ -11715,10 +11625,10 @@
See \local@_from@_prefix\ above.

.conf local@_interfaces "string list" "see below"
-This option controls which network interfaces are used by the daemon for
-listening; they are also used to identify the local host when routing. Chapter
-~~CHAPinterfaces contains a full description of this option and the related
-options \extra@_local@_interfaces\ and \hosts@_treat@_as@_local\. The default
+This option controls which network interfaces are used by the daemon for
+listening; they are also used to identify the local host when routing. Chapter
+~~CHAPinterfaces contains a full description of this option and the related
+options \extra@_local@_interfaces\ and \hosts@_treat@_as@_local\. The default
value for \local@_interfaces\ is
.display asis
local_interfaces = 0.0.0.0
@@ -11873,7 +11783,7 @@
.index limit||message size
.index size||of message, limit
This option limits the maximum size of message that Exim will process. The
-value is expanded for each incoming
+value is expanded for each incoming
connection so, for example, it can be made to depend on the IP address of the
remote host for messages arriving via TCP/IP. \**Note**\: This limit cannot be
made to depend on a message's sender or any other properties of an individual
@@ -11911,11 +11821,11 @@
recipient, and remote deliveries are normally run under Exim's own uid and gid.
It is usually desirable to prevent any deliveries from running as root, as a
safety precaution.
-
-When Exim is built, an option called \\FIXED@_NEVER@_USERS\\ can be set to a
-list of users that must not be used for local deliveries. This list is fixed in
-the binary and cannot be overridden by the configuration file. By default, it
-contains just the single user name `root'. The \never@_users\ runtime option
+
+When Exim is built, an option called \\FIXED@_NEVER@_USERS\\ can be set to a
+list of users that must not be used for local deliveries. This list is fixed in
+the binary and cannot be overridden by the configuration file. By default, it
+contains just the single user name `root'. The \never@_users\ runtime option
can be used to add more users to the fixed list.

If a message is to be delivered as one of the users on the fixed list or the
@@ -11979,8 +11889,8 @@
.endd
If no path is set, the pid is written to the file \(exim-daemon.pid)\ in Exim's
spool directory.
-The value set by the option can be overridden by the \-oP-\ command line
-option. A pid file is not written if a `non-standard' daemon is run by means of
+The value set by the option can be overridden by the \-oP-\ command line
+option. A pid file is not written if a `non-standard' daemon is run by means of
the \-oX-\ option, unless a path is explicitly supplied by \-oP-\.

.conf pipelining@_advertise@_hosts "host list$**$" $*$
@@ -11989,11 +11899,9 @@
\\PIPELINING\\ extension to specific hosts. When \\PIPELINING\\ is not
advertised and \smtp@_enforce@_sync\ is true, an Exim server enforces strict
synchronization for each SMTP command and response.
-.em
When \\PIPELINING\\ is advertised, Exim assumes that clients will use it; `out
-of order' commands that are `expected' do not count as protocol errors (see
+of order' commands that are `expected' do not count as protocol errors (see
\smtp@_max@_synprot@_errors\).
-.nem

.conf preserve@_message@_logs boolean false
.index message logs, preserving
@@ -12007,22 +11915,18 @@
.index name||of local host
.index host||name of local
.index local host||name of
-.em
This specifies the name of the current host. It is used in the default \\EHLO\\
or \\HELO\\ command for outgoing SMTP messages (changeable via the \helo@_data\
option in the \%smtp%\ transport),
-.nem
and as the default for \qualify@_domain\. If it is not set, Exim calls
\*uname()*\ to find it. If this fails, Exim panics and dies. If the name
returned by \*uname()*\ contains only one component, Exim passes it to
\*gethostbyname()*\ (or \*getipnodebyname()*\ when available) in order to
obtain the fully qualified version.

-.em
The value of \$primary@_hostname$\ is also used by default in some SMTP
response messages from an Exim server. This can be changed dynamically by
setting \smtp@_active@_hostname\.
-.nem

.conf print@_topbitchars boolean false
.index printing characters
@@ -12036,7 +11940,7 @@

   .conf process@_log@_path string unset
   .index process log path
  -.index log||process log 
  +.index log||process log
   .index \*exiwhat*\
   This option sets the name of the file to which an Exim process writes its
   `process log' when sent a USR1 signal. This is used by the \*exiwhat*\ utility
  @@ -12218,12 +12122,10 @@
   Received: by scrooge.carol.example with local (Exim 4.00)
           id 16IOWW-000083-00; Tue, 25 Dec 2001 14:43:41 +0000
   .endd
  -.em
  -Until the body of the message has been received, the timestamp is the time when 
  -the message started to be received. Once the body has arrived, and all policy 
  -checks have taken place, the timestamp is updated to the time at which the 
  +Until the body of the message has been received, the timestamp is the time when
  +the message started to be received. Once the body has arrived, and all policy
  +checks have taken place, the timestamp is updated to the time at which the
   message was accepted.
  -.nem


.conf received@_headers@_max integer 30
.index loop||prevention
@@ -12243,14 +12145,12 @@
affects message header lines. Exim does not reject unqualified recipient
addresses in headers, but it qualifies them only if the message came from a
host that matches \recipient@_unqualified@_hosts\,
-.em
or if the message was submitted locally (not using TCP/IP), and the \-bnq-\
option was not set.
-.nem

.conf recipients@_max integer 0
.index limit||number of recipients
-.index recipient||maximum number
+.index recipient||maximum number
If this option is set greater than zero, it specifies the maximum number of
original recipients for any message. Additional recipients that are generated
by aliasing or forwarding do not count. SMTP messages get a 452 response for
@@ -12366,10 +12266,8 @@
reject unqualified addresses in headers that contain sender addresses, but it
qualifies them only if the message came from a host that matches
\sender@_unqualified@_hosts\,
-.em
or if the message was submitted locally (not using TCP/IP), and the \-bnq-\
option was not set.
-.nem

.conf smtp@_accept@_keepalive boolean true
.index keepalive||on incoming connection
@@ -12402,7 +12300,7 @@
Exim counts the number of `non-mail' commands in an SMTP session, and drops the
connection if there are too many. This option defines `too many'. The check
catches some denial-of-service attacks, repeated failing \\AUTH\\s, or a mad
-client looping sending \\EHLO\\, for example. The check is applied only if the
+client looping sending \\EHLO\\, for example. The check is applied only if the
client host matches \smtp@_accept@_max@_nonmail@_hosts\.

When a new message is expected, one occurrence of \\RSET\\ is not counted. This
@@ -12491,7 +12389,6 @@
connections are accepted only from hosts listed in \smtp@_reserve@_hosts\.
See also \smtp@_accept@_max@_per@_host\.

-.em
.conf smtp@_active@_hostname string$**$ unset
.index host||name in SMTP responses
.index SMTP||host name in responses
@@ -12511,7 +12408,6 @@
.endd
If you set \smtp@_active@_hostname\, you probably also want to set
\smtp@_banner\, since its default value references \$primary@_hostname$\.
-.nem

.conf smtp@_banner string$**$ "see below"
.index SMTP||welcome banner
@@ -12567,9 +12463,7 @@
transmission delays (unexpected input may be on its way but not yet received
when Exim checks). However, it does detect many instances. The check can be
disabled by setting \smtp@_enforce@_sync\ false.
-.em
See also \pipelining@_advertise@_hosts\.
-.nem

.conf smtp@_etrn@_command string$**$ unset
.index \\ETRN\\||command to be run
@@ -12608,7 +12502,7 @@
.conf smtp@_max@_synprot@_errors integer 3
.index SMTP||limiting syntax and protocol errors
.index limit||SMTP syntax and protocol errors
-Exim rejects SMTP commands that contain syntax or protocol errors. In
+Exim rejects SMTP commands that contain syntax or protocol errors. In
particular, a syntactically invalid email address, as in this command:
.display asis
RCPT TO:<abc xyz@???>
@@ -12619,25 +12513,21 @@
too many syntax or protocol errors in one SMTP session, the connection is
dropped. The limit is set by this option.

-.em
.index \\PIPELINING\\||expected errors
-When the \\PIPELINING\\ extension to SMTP is in use, some protocol errors are
-`expected', for instance, a \\RCPT\\ command after a rejected \\MAIL\\ command.
-Exim assumes that \\PIPELINING\\ will be used if it advertises it (see
-\pipelining@_advertise@_hosts\), and in this situation, `expected' errors do
+When the \\PIPELINING\\ extension to SMTP is in use, some protocol errors are
+`expected', for instance, a \\RCPT\\ command after a rejected \\MAIL\\ command.
+Exim assumes that \\PIPELINING\\ will be used if it advertises it (see
+\pipelining@_advertise@_hosts\), and in this situation, `expected' errors do
not count towards the limit.
-.nem


.conf smtp@_max@_unknown@_commands integer 3
.index SMTP||limiting unknown commands
.index limit||unknown SMTP commands
-If there are too many unrecognized commands in an incoming SMTP session, an
-Exim server drops the connection. This is a defence against some kinds of abuse
-that subvert web
-.em
-clients
-.nem
+If there are too many unrecognized commands in an incoming SMTP session, an
+Exim server drops the connection. This is a defence against some kinds of abuse
+that subvert web
+clients
into making connections to SMTP ports; in these circumstances, a number of
non-SMTP command lines are sent first.

@@ -12675,7 +12565,7 @@
seconds, increasing by a factor of 1.05 each time. The second setting applies
delays to \\RCPT\\ commands when more than four occur in a single message.

-It is also possible to configure delays explicitly in ACLs. See section
+It is also possible to configure delays explicitly in ACLs. See section
~~SECTACLmodi for details.


@@ -12691,13 +12581,13 @@
This sets a timeout value for SMTP reception. It applies to all forms of SMTP
input, including batch SMTP. If a line of input (either an SMTP command or a
data line) is not received within this time, the SMTP connection is dropped and
-the message is abandoned.
+the message is abandoned.
A line is written to the log containing one of the following messages:
.display asis
SMTP command timeout on connection from...
SMTP data timeout on connection from...
.endd
-The former means that Exim was expecting to read an SMTP command; the latter
+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.


@@ -12791,10 +12681,8 @@
ignored. If this is in the envelope and the message is passed on to another
MTA, the dot is not passed on. If this option is not set, a dot at the end of a
domain causes a syntax error.
-.em
-However, addresses in header lines are checked only when an ACL requests header
+However, addresses in header lines are checked only when an ACL requests header
syntax checking.
-.nem

.conf syslog@_duplication boolean true
.index syslog||duplicate log lines, suppressing
@@ -12811,9 +12699,9 @@

.conf syslog@_facility string unset
.index syslog||facility, setting
-This option sets the syslog `facility' name, used when Exim is logging to
+This option sets the syslog `facility' name, used when Exim is logging to
syslog. The value must be one of the strings `mail', `user', `news', `uucp',
-`daemon', or `local\*x*\' where \*x*\ is a digit between 0 and 7. If this
+`daemon', or `local\*x*\' where \*x*\ is a digit between 0 and 7. If this
option is unset, `mail' is used. See chapter ~~CHAPlog for details of Exim's
logging.

@@ -12946,31 +12834,29 @@
assumed to be in this file if \tls@_privatekey\ is unset. See chapter ~~CHAPTLS
for further details.

-\**Note**\: The certificates defined by this option are used only when Exim is
+\**Note**\: The certificates defined by this option are used only when Exim is
receiving incoming messages as a server. If you want to supply certificates for
use when sending messages as a client, you must set the \tls@_certificate\
option in the relevant \%smtp%\ transport.

-.em
.conf tls@_crl string$**$ unset
.index TLS||server certificate revocation list
.index certificate||revocation list for server
This option specifies a certificate revocation list. The expanded value must
be the name of a file that contains a CRL in PEM format.
-.nem

.conf tls@_dhparam string$**$ unset
.index TLS||D-H parameters for server
The value of this option is expanded, and must then be the absolute path to
a file which contains the server's DH parameter values.
-This is used only for OpenSSL. When Exim is linked with GnuTLS, this option is
+This is used only for OpenSSL. When Exim is linked with GnuTLS, this option is
ignored. See section ~~SECTopenvsgnu for further details.

.conf tls@_privatekey string$**$ unset
.index TLS||server private key, location of
The value of this option is expanded, and must then be the absolute path to
a file which contains the server's private key.
-If this option is unset, the private key is assumed to be in the same file as
+If this option is unset, the private key is assumed to be in the same file as
the server's certificates. See chapter ~~CHAPTLS for further details.

.conf tls@_remember@_esmtp boolean false
@@ -12981,17 +12867,15 @@
support for broken clients that fail to send a new \\EHLO\\ after starting a
TLS session.

-.em
.conf tls@_require@_ciphers string$**$ unset
.index TLS||requiring specific ciphers
.index cipher||requiring specific
This option controls which ciphers can be used for incoming TLS connections.
-(The \%smtp%\ transport has an option of the same name for controlling outgoing
+(The \%smtp%\ transport has an option of the same name for controlling outgoing
connections.) This option is expanded for each connection, so can be varied for
different clients if required. The value of this option must be a list of
permitted cipher suites. The OpenSSL and GnuTLS libraries handle cipher control
in somewhat different ways. Details are given in section ~~SECTreqciphsslgnu.
-.nem

.conf tls@_try@_verify@_hosts "host list$**$" unset
.index TLS||client certificate verification
@@ -13012,9 +12896,9 @@
.index TLS||client certificate verification
.index certificate||verification of client
This option, along with \tls@_try@_verify@_hosts\, controls the checking of
-certificates from clients.
-The expected certificates are defined by \tls@_verify@_certificates\, which
-must be set. A configuration error occurs if either \tls@_verify@_hosts\ or
+certificates from clients.
+The expected certificates are defined by \tls@_verify@_certificates\, which
+must be set. A configuration error occurs if either \tls@_verify@_hosts\ or
\tls@_try@_verify@_hosts\ is set and \tls@_verify@_certificates\ is not set.

Any client that matches \tls@_verify@_hosts\ is constrained by
@@ -13036,7 +12920,7 @@
.index trusted group
.index group||trusted
If this option is set, any process that is running in one of the listed groups,
-or which has one of them as a supplementary group, is trusted.
+or which has one of them as a supplementary group, is trusted.
The groups can be specified numerically or by name.
See section ~~SECTtrustedadmin for details of what trusted callers are
permitted to do. If neither \trusted@_groups\ nor \trusted@_users\ is set, only
@@ -13046,7 +12930,7 @@
.index trusted user
.index user||trusted
If this option is set, any process that is running as one of the listed users
-is trusted.
+is trusted.
The users can be specified numerically or by name.
See section ~~SECTtrustedadmin for details of what trusted callers are
permitted to do. If neither \trusted@_groups\ nor \trusted@_users\ is set, only
@@ -13087,7 +12971,7 @@
users are allowed to set envelope sender addresses that match any of the
patterns in the list. Like all address lists, the string is expanded. The
identity of the user is in \$sender@_ident$\, so you can, for example, restrict
-users to setting senders that start with their login ids
+users to setting senders that start with their login ids
followed by a hyphen
by a setting like this:
.display asis
@@ -13149,12 +13033,10 @@
\delay@_warning\. Details of the file's contents are given in chapter
~~CHAPemsgcust. See also \bounce@_message@_file\.

-.em
.conf write@_rejectlog boolean true
.index reject log||disabling
If this option is set false, Exim no longer writes anything to the reject log.
See chapter ~~CHAPlog for details of what Exim writes to its logs.
-.nem

.endconf

@@ -13171,11 +13053,11 @@
.index options||generic, for routers
.index generic options||router

-This chapter describes the generic options that apply to all routers,
+This chapter describes the generic options that apply to all routers,
identifying those that are preconditions. For a general description of how a
router operates, see sections ~~SECTrunindrou and ~~SECTrouprecon. The second
of these sections specifies the order in which the preconditions are tested.
-The order of expansion of the options that provide data for a transport is:
+The order of expansion of the options that provide data for a transport is:
\errors@_to\, \headers@_add\, \headers@_remove\, \transport\.

.startconf
@@ -13189,13 +13071,13 @@

When the expansion succeeds, the value is retained with the address, and can be
accessed using the variable \$address@_data$\ in the current router, subsequent
-routers, and the eventual transport.
+routers, and the eventual transport.

-\**Warning**\: if the current or any subsequent router is a \%redirect%\ router
+\**Warning**\: if the current or any subsequent router is a \%redirect%\ router
that runs a user's filter file, the contents of \$address@_data$\ are
accessible in the filter. This is not normally a problem, because such data is
-usually either not confidential or it `belongs' to the current user, but if you
-do put confidential data into \$address@_data$\ you need to remember this
+usually either not confidential or it `belongs' to the current user, but if you
+do put confidential data into \$address@_data$\ you need to remember this
point.

Even if the router declines or passes, the value of \$address@_data$\ remains
@@ -13218,10 +13100,10 @@
lookups. (Exim does cache the most recent lookup, but there may be several
addresses in a message which cause lookups to occur.)

-The \address@_data\ facility is also useful as a means of passing information
+The \address@_data\ facility is also useful as a means of passing information
from one router to another,
-and from a router to a transport. In addition, if \address@_data\ is set by a
-router when verifying an address from an ACL, its value is available for use in
+and from a router to a transport. In addition, if \address@_data\ is set by a
+router when verifying an address from an ACL, its value is available for use in
the rest of the ACL statement.


@@ -13230,8 +13112,8 @@
.index router||skipping when address testing
If this option is set false, the router is skipped when routing is being tested
by means of the \-bt-\ command line option. This can be a convenience when your
-first router sends messages to an external scanner, because it saves you
-having to set the `already scanned' indicator when testing real address
+first router sends messages to an external scanner, because it saves you
+having to set the `already scanned' indicator when testing real address
routing.


@@ -13251,7 +13133,7 @@
.display asis
cannot_route_message = Unknown local user
.endd
-on the final router that checks for local users. If string expansion fails, the
+on the final router that checks for local users. If string expansion fails, the
default message is used.
Unless the expansion failure was explicitly forced, a message about the failure
is written to the main and panic logs, in addition to the normal message about
@@ -13277,15 +13159,15 @@
than trying to read \(/etc/passwd)\ directly. This means that other methods of
holding password data (such as NIS) are supported. If the local part is a local
user, \$home$\ is set from the password data, and can be tested in other
-preconditions that are evaluated after this one
+preconditions that are evaluated after this one
(the order of evaluation is given in section ~~SECTrouprecon). However, the
value of \$home$\ can be overridden by \router@_home@_directory\.
If the local part is not a local user, the router is skipped.

If you want to check that the local part is either the name of a local user
-or matches something else, you cannot combine \check@_local@_user\ with a
-setting of \local@_parts\, because that specifies the logical \*and*\ of the
-two conditions. However, you can use a \%passwd%\ lookup in a \local@_parts\
+or matches something else, you cannot combine \check@_local@_user\ with a
+setting of \local@_parts\, because that specifies the logical \*and*\ of the
+two conditions. However, you can use a \%passwd%\ lookup in a \local@_parts\
setting to achieve this. For example:
.display asis
local_parts = passwd;$local_part : lsearch;/etc/other/users
@@ -13307,14 +13189,14 @@
of the other options below are common special cases that could in fact be
specified using \condition\.
Note that \condition\ is the last precondition to be evaluated (see
-section ~~SECTrouprecon).
+section ~~SECTrouprecon).


.conf debug@_print string$**$ unset
.index testing||variables in drivers
If this option is set and debugging is enabled (see the \-d-\ command line
-option), the string is expanded and included in the debugging output.
-If expansion of the string fails, the error message is written to the debugging
+option), the string is expanded and included in the debugging output.
+If expansion of the string fails, the error message is written to the debugging
output, and Exim carries on processing.
This option is provided to help with checking out the values of variables and
so on when debugging router configurations. For example, if a \condition\
@@ -13326,11 +13208,9 @@

.conf disable@_logging boolean false
If this option is set true, nothing is logged for any routing errors
-.em
or for any deliveries caused by this router. You should not set this option
unless you really, really know what you are doing. See also the generic
transport option of the same name.
-.nem

.conf domains "domain list$**$ (precondition)" unset
.index router||restricting to specific domains
@@ -13338,7 +13218,7 @@
the list. If the match is achieved by means of a file lookup, the data that the
lookup returned for the domain is placed in \$domain@_data$\ for use in string
expansions of the driver's private options.
-See section ~~SECTrouprecon for a list of the order in which preconditions
+See section ~~SECTrouprecon for a list of the order in which preconditions
are evaluated.


@@ -13354,8 +13234,8 @@
delivery or it may generate child addresses. In both cases, if there is a
delivery problem during later processing, the resulting bounce message is sent
to the address that results from expanding this string, provided that the
-address verifies successfully.
-\errors@_to\ is expanded before \headers@_add\, \headers@_remove\, and
+address verifies successfully.
+\errors@_to\ is expanded before \headers@_add\, \headers@_remove\, and
\transport\.

If the option is unset, or the expansion is forced to fail, or the result of
@@ -13400,8 +13280,8 @@
If this option is turned off, the router is skipped when testing an address
as a result of processing an SMTP \\EXPN\\ command. You might, for example,
want to turn it off on a router for users' \(.forward)\ files, while leaving it
-on for the system alias file.
-See section ~~SECTrouprecon for a list of the order in which preconditions
+on for the system alias file.
+See section ~~SECTrouprecon for a list of the order in which preconditions
are evaluated.

The use of the SMTP \\EXPN\\ command is controlled by an ACL (see chapter
@@ -13442,8 +13322,8 @@
.index router||setting group
When a router queues an address for a transport, and the transport does not
specify a group, the group given here is used when running the delivery
-process.
-The group may be specified numerically or by name. If expansion fails, the
+process.
+The group may be specified numerically or by name. If expansion fails, the
error is logged and delivery is deferred.
The default is unset, unless \check@_local@_user\ is set, when the default
is taken from the password information. See also \initgroups\ and \user\ and
@@ -13500,14 +13380,12 @@
option has no effect when an address is being verified. The \headers@_remove\
option is expanded after \errors@_to\ and \headers@_add\, but before
\transport\. If the expansion is forced to fail, the option has no effect.
-Other expansion failures are treated as configuration errors.
+Other expansion failures are treated as configuration errors.

-.em
After expansion, the string must consist of a colon-separated list of header
names. This is confusing, because header names themselves are often terminated
by colons. In this case, the colons are the list separators, not part of the
names.
-.nem
For example:
.display asis
headers_remove = return-receipt-to:acknowledge-to
@@ -13531,8 +13409,7 @@
.display asis
ignore_target_hosts = 127.0.0.1
.endd
-on the relevant router.
-.em
+on the relevant router.
If all the hosts found by a \%dnslookup%\ router are discarded in this way, the
router declines. In a conventional configuration, an attempt to mail to such a
domain would then normally provoke the `unrouteable domain' error, and an
@@ -13540,7 +13417,6 @@

Similarly, if \ignore@_target@_hosts\ is set on an \%ipliteral%\ router, the
router declines if presented with one of the listed addresses.
-.nem

This option may also be useful for ignoring link-local and site-local IPv6
addresses. Because, like all host lists, the value of \ignore@_target@_hosts\
@@ -13584,9 +13460,9 @@
running, the prefix is removed from the local part, and is available in the
expansion variable \$local@_part@_prefix$\. If the router accepts the address,
this remains true during subsequent delivery.
-In particular, the local part that is transmitted in the \\RCPT\\ command
-for LMTP, SMTP, and BSMTP deliveries has the prefix removed by default. This
-behaviour can be overridden by setting \rcpt@_include@_affixes\ true on the
+In particular, the local part that is transmitted in the \\RCPT\\ command
+for LMTP, SMTP, and BSMTP deliveries has the prefix removed by default. This
+behaviour can be overridden by setting \rcpt@_include@_affixes\ true on the
relevant transport.

The prefix facility is commonly used to handle local parts of the form
@@ -13629,7 +13505,7 @@
.index router||restricting to specific local parts
.index local part||checking in router
The router is run only if the local part of the address matches the list.
-See section ~~SECTrouprecon for a list of the order in which preconditions
+See section ~~SECTrouprecon for a list of the order in which preconditions
are evaluated, and
section ~~SECTlocparlis for a discussion of local part lists. Because the
string is expanded, it is possible to make it depend on the domain, for
@@ -13724,11 +13600,11 @@
This option provides a general mechanism for predicating the running of a
router on the existence or non-existence of certain files or directories.
Before running a router, as one of its precondition tests, Exim works its way
-through the \require@_files\ list, expanding each item separately.
+through the \require@_files\ list, expanding each item separately.

Because the list is split before expansion, any colons in expansion items must
be doubled, or the facility for using a different list separator must be used.
-If any expansion is forced to fail, the item is ignored. Other expansion
+If any expansion is forced to fail, the item is ignored. Other expansion
failures cause routing of the address to be deferred.

If any expanded string is empty, it is ignored. Otherwise, except as described
@@ -13752,7 +13628,7 @@
transport (for example \(.procmailrc)\).

During delivery, the \*stat()*\ function is run as root, but there is a
-facility for some checking of the accessibility of a file by another user.
+facility for some checking of the accessibility of a file by another user.
This is not a proper permissions check, but just a `rough' check that
operates as follows:

@@ -13779,11 +13655,11 @@
may yield the error \\EACCES\\ (`Permission denied'). This means that the Exim
user is not permitted to read one of the directories on the file's path.

-\**Warning 2**\: Even when Exim is running as root while delivering a message,
-\*stat()*\ can yield \\EACCES\\ for a file on an NFS directory that is mounted
+\**Warning 2**\: Even when Exim is running as root while delivering a message,
+\*stat()*\ can yield \\EACCES\\ for a file on an NFS directory that is mounted
without root access.

-In both cases,
+In both cases,
the default action is to consider this a configuration error, and routing is
deferred because the existence or non-existence of the file cannot be
determined. However, in some circumstances it may be desirable to treat this
@@ -13794,7 +13670,7 @@
require_files = +/some/file
.endd
If the router is not an essential part of verification (for example, it
-handles users' \(.forward)\ files), another solution is to set the \verify\
+handles users' \(.forward)\ files), another solution is to set the \verify\
option false so that the router is skipped when verifying.


@@ -13815,11 +13691,9 @@
for transport delays; they are controlled by a generic transport option of the
same name.

-.em
-The setting of \retry@_use@_local@_part\ applies only to the router on which it
-appears. If the router generates child addresses, they are routed
+The setting of \retry@_use@_local@_part\ applies only to the router on which it
+appears. If the router generates child addresses, they are routed
independently; this setting does not become attached to them.
-.nem


.conf router@_home@_directory string$**$ unset
@@ -13834,7 +13708,7 @@

Expansion of \router@_home@_directory\ happens immediately after the
\check@_local@_user\ test (if configured), before any further expansions take
-place.
+place.
(See section ~~SECTrouprecon for a list of the order in which preconditions
are evaluated.)
While the router is running, \router__home@_directory\ overrides the value of
@@ -13862,7 +13736,7 @@
.index local host||MX pointing to
This option applies to those routers that use a recipient address to find a
list of remote hosts. Currently, these are the \%dnslookup%\, \%ipliteral%\,
-and \%manualroute%\ routers.
+and \%manualroute%\ routers.
Certain configurations of the \%queryprogram%\ router can also specify a list
of remote hosts.
Usually such routers are configured to send the message to a remote host via an
@@ -13930,8 +13804,8 @@
.conf senders "address list$**$ (precondition)" unset
.index router||checking senders
If this option is set, the router is skipped unless the message's sender
-address matches something on the list.
-See section ~~SECTrouprecon for a list of the order in which preconditions
+address matches something on the list.
+See section ~~SECTrouprecon for a list of the order in which preconditions
are evaluated.

There are issues concerning verification when the running of routers is
@@ -13957,7 +13831,7 @@

The \translate@_ip@_address\ string is expanded for every IP address generated
by the router, with the generated address set in \$host@_address$\. If the
-expansion is forced to fail, no action is taken.
+expansion is forced to fail, no action is taken.
For any other expansion error, delivery of the message is deferred.
If the result of the expansion is an IP address, that replaces the original
address; otherwise the result is assumed to be a host name -- this is looked up
@@ -13980,8 +13854,8 @@
.conf transport string$**$ unset
This option specifies the transport to be used when a router accepts an address
and sets it up for delivery. A transport is never needed if a router is used
-only for verification. The value of the option is expanded at routing time,
-after the expansion of \errors@_to\,
+only for verification. The value of the option is expanded at routing time,
+after the expansion of \errors@_to\,
\headers@_add\, and \headers@_remove\,
and result must be the name of one of the configured transports. If it is
not, delivery is deferred.
@@ -14020,7 +13894,7 @@
\transport@_home@_directory\ is not set for the router, the home directory for
the tranport is taken from the password data if \check@_local@_user\ is set for
the router. Otherwise it is taken from \router@_home@_directory\ if that option
-is set; if not, no home directory is set for the transport.
+is set; if not, no home directory is set for the transport.

See chapter ~~CHAPenvironment for further details of the local delivery
environment.
@@ -14037,21 +13911,21 @@

When this option is set true, routing does not cease if the router accepts the
address. Instead, a copy of the incoming address is passed to the next router,
-overriding a false setting of \more\. There is little point in setting \more\
-false if \unseen\ is always true, but it may be useful in cases when the value
+overriding a false setting of \more\. There is little point in setting \more\
+false if \unseen\ is always true, but it may be useful in cases when the value
of \unseen\ contains expansion items (and therefore, presumably, is sometimes
true and sometimes false).

The \unseen\ option can be used to cause
.index copy of message (\unseen\ option)
copies of messages to be delivered to some other destination, while also
-carrying out a normal delivery. In effect, the current address is made into a
-`parent' that has two children -- one that is delivered as specified by this
+carrying out a normal delivery. In effect, the current address is made into a
+`parent' that has two children -- one that is delivered as specified by this
router, and a clone that goes on to be routed further.

Header lines added to the address (or specified for removal) by this router or
by previous routers affect the `unseen' copy of the message only. The clone
-that continues to be processed by further routers starts with no added headers
+that continues to be processed by further routers starts with no added headers
and none specified for removal.

However, any data that was set by the \address@_data\ option in the current or
@@ -14067,7 +13941,7 @@
.index filter||user for processing
When a router queues an address for a transport, and the transport does not
specify a user, the user given here is used when running the delivery process.
-The user may be specified numerically or by name. If expansion fails, the
+The user may be specified numerically or by name. If expansion fails, the
error is logged and delivery is deferred.
This user is also used by the \%redirect%\ router when running a filter file.
The default is unset, except when \check@_local@_user\ is set. In this case,
@@ -14091,21 +13965,21 @@
and \verify@_recipient\.

\**Warning**\: When the router is being run to verify addresses for an incoming
-SMTP message, Exim is not running as root, but under its own uid. If the router
-accesses any files, you need to make sure that they are accessible to the Exim
+SMTP message, Exim is not running as root, but under its own uid. If the router
+accesses any files, you need to make sure that they are accessible to the Exim
user or group.

.conf verify@_recipient "boolean (precondition)" true
If this option is false, the router is skipped when verifying recipient
addresses
or testing recipient verification using \-bv-\.
-See section ~~SECTrouprecon for a list of the order in which preconditions
+See section ~~SECTrouprecon for a list of the order in which preconditions
are evaluated.

.conf verify@_sender "boolean (precondition)" true
If this option is false, the router is skipped when verifying sender addresses
or testing sender verification using \-bvs-\.
-See section ~~SECTrouprecon for a list of the order in which preconditions
+See section ~~SECTrouprecon for a list of the order in which preconditions
are evaluated.

.endconf
@@ -14160,8 +14034,7 @@
domain in the DNS. A transport must always be set for this router, unless
\verify@_only\ is set.

-.em
-If SRV support is configured (see \check@_srv\ below), Exim first searches for
+If SRV support is configured (see \check@_srv\ below), Exim first searches for
SRV records. If none are found, or if SRV support is not configured,
MX records are looked up. If no MX records exist, address records are sought.
However, \mx@_domains\ can be set to disable the direct use of address records.
@@ -14176,7 +14049,6 @@
Unless they have the highest priority (lowest MX value), MX records that point
to the local host, or to any host name that matches \hosts__treat__as__local\,
are discarded, together with any other MX records of equal or lower priority.
-.nem

.index MX record||pointing to local host
.index local host||MX pointing to
@@ -14199,7 +14071,6 @@
differently to other domains. The way in which Exim decides whether a host is
the local host is described in section ~~SECTreclocipadd.

-.em
.conf check@_srv string$**$ unset
.index SRV record||enabling use of
The dnslookup router supports the use of SRV records (see RFC 2782) in
@@ -14232,15 +14103,12 @@
purpose. However, SRV records have an additional `weight' feature which
some people might find useful when trying to split an SMTP load between
hosts of different power.
-.nem

.conf mx@_domains "domain list$**$" unset
.index MX record||required to exist
.index SRV record||required to exist
-.em
A domain that matches \mx@_domains\ is required to have either an MX or an SRV
record in order to be recognised. (The name of this option could be improved.)
-.nem
For example, if all the mail hosts in \*fict.example*\ are known to have MX
records, except for those in \*discworld.fict.example*\, you could use this
setting:
@@ -14303,10 +14171,10 @@
without processing them independently,
provided the following conditions are met:
.numberpars $.
-No router that processed the address specified \headers@_add\ or
+No router that processed the address specified \headers@_add\ or
\headers@_remove\.
.nextp
-The router did not change the address in any way, for example, by `widening'
+The router did not change the address in any way, for example, by `widening'
the domain.
.endp

@@ -14342,9 +14210,8 @@

.endconf

-.em
.section Effect of qualify@_single and search@_parents
-When a domain from an envelope recipient is changed by the resolver as a result
+When a domain from an envelope recipient is changed by the resolver as a result
of the \qualify@_single\ or \search@_parents\ options, Exim rewrites the
corresponding address in the message's header lines unless \rewrite@_headers\
is set false. Exim then re-routes the address, using the full domain.
@@ -14357,7 +14224,6 @@
.endd
that may happen while processing a router precondition before the router is
entered. No widening ever takes place for these lookups.
-.nem



@@ -14375,7 +14241,7 @@
.chapter The ipliteral router
.set runningfoot "ipliteral router"
.index \%ipliteral%\ router
-.index domain literal||routing
+.index domain literal||routing
.index routers||\%ipliteral%\
This router has no private options. Unless it is being used purely for
verification (see \verify@_only\) a transport is required to be defined by the
@@ -14385,15 +14251,13 @@
.display asis
root@???
.endd
-by setting up delivery to the host with that IP address.
+by setting up delivery to the host with that IP address.

-.em
-If the IP address matches something in \ignore@_target@_hosts\, the router
+If the IP address matches something in \ignore@_target@_hosts\, the router
declines.
-.nem
.index \self\ option||in \%ipliteral%\ router
If an IP literal turns out to refer to the local host, the generic \self\
-option determines what happens.
+option determines what happens.

The RFCs require support for domain literals; however, their use is
controversial in today's Internet. If you want to use this router, you must
@@ -14448,7 +14312,7 @@

   .conf hosts string unset
   This option must be supplied. Its value is a colon-separated list of host
  -names. The hosts are looked up using \*gethostbyname()*\ 
  +names. The hosts are looked up using \*gethostbyname()*\
   (or \*getipnodebyname()*\ when available)
   and are tried in order until one responds to the query. If none respond, what
   happens is controlled by \optional\.
  @@ -14650,12 +14514,12 @@
     dict.ref.example  mail-1.ref.example:mail-2.ref.example ; \
     thes.ref.example  mail-3.ref.example:mail-4.ref.example
   .endd
  -The three parts of a rule are separated by white space. The pattern and the 
  +The three parts of a rule are separated by white space. The pattern and the
   list of hosts can be enclosed in quotes if necessary, and if they are, the
   usual quoting rules apply. Each rule in a \route@_list\ must start with a
   single domain pattern, which is the only mandatory item in the rule. The
   pattern is in the same format as one item in a domain list (see section
  -~~SECTdomainlist), 
  +~~SECTdomainlist),
   except that it may not be the name of an interpolated file.
   That is, it may be wildcarded, or a regular expression, or a file or database
   lookup (with semicolons doubled, because of the use of semicolon as a separator
  @@ -14714,9 +14578,8 @@
   .endp



-.em
.section How the list of hosts is used
-When an address is routed to an \%smtp%\ transport by \%manualroute%\, each of
+When an address is routed to an \%smtp%\ transport by \%manualroute%\, each of
the hosts is tried, in the order specified, when carrying out the SMTP
delivery. However, the order can be changed by setting the \hosts@_randomize\
option, either on the router (see section ~~SECTprioptman above), or on the
@@ -14730,11 +14593,11 @@
route_list = * x.y.z:p.q.r/MX:e.f.g
.endd
If the \hosts@_randomize\ option is set, the order of the items in the list is
-randomized before any lookups are done. Exim then scans the list; for any name
-that is not followed by \"/MX"\ it looks up an IP address. If this turns out to
+randomized before any lookups are done. Exim then scans the list; for any name
+that is not followed by \"/MX"\ it looks up an IP address. If this turns out to
be an interface on the local host and the item is not the first in the list,
Exim discards it and any subsequent items. If it is the first item, what
-happens is controlled by the
+happens is controlled by the
.index \self\ option||in \%manualroute%\ router
\self\ option of the router.

@@ -14745,7 +14608,6 @@
values in the MX records, according to the usual rules. Because randomizing
happens before the MX lookup, it does not affect the order that is defined by
MX preferences.
-.nem

If the local host is present in the sublist obtained from MX records, but is
not the most preferred host in that list, it and any equally or less
@@ -14764,10 +14626,8 @@
failures when looking up IP addresses: \pass@_on@_timeout\ and
\host@_find@_failed\ are used when relevant.

-.em
The generic \ignore@_target@_hosts\ option applies to all hosts in the list,
whether obtained from an MX lookup or not.
-.nem


.section How the options are used
@@ -14779,7 +14639,7 @@
per-rule basis, and how the IP addresses of the hosts are to be found when
routing to a remote transport. These options are as follows:
.numberpars $.
-\randomize\: randomize the order of the hosts in this list, overriding the
+\randomize\: randomize the order of the hosts in this list, overriding the
setting of \hosts@_randomize\ for this routing rule only.
.nextp
\no@_randomize\: do not randomize the order of the hosts in this list,
@@ -14790,8 +14650,8 @@
also look in \(/etc/hosts)\ or other sources of information.
.nextp
\bydns\: look up address records for the hosts directly in the DNS; fail if
-no address records are found. If there is a temporary DNS error (such as a
-timeout), delivery is deferred.
+no address records are found. If there is a temporary DNS error (such as a
+timeout), delivery is deferred.
.endp
For example:
.display asis
@@ -15053,12 +14913,12 @@
The list of hosts and the lookup type are needed only if the transport is an
\%smtp%\ transport that does not itself supply a list of hosts.

-The format of the list of hosts is the same as for the \%manualroute%\ router.
+The format of the list of hosts is the same as for the \%manualroute%\ router.
As well as host names and IP addresses, it may contain names followed by
\"/MX"\ to specify sublists of hosts that are obtained by looking up MX
records.

  -If the lookup type is not specified, Exim behaves as follows when trying to 
  +If the lookup type is not specified, Exim behaves as follows when trying to
   find an IP address for each host: First, a DNS lookup is done. If this yields
   anything other than \\HOST@_NOT@_FOUND\\, that result is used. Otherwise, Exim
   goes on to try a call to \*getipnodebyname()*\ or \*gethostbyname()*\, and the
  @@ -15124,12 +14984,10 @@
     driver = redirect
     data = ${lookup{$local_part}lsearch{/etc/aliases}}
   .endd
  -.em
  -If the lookup fails, the expanded string in this example is empty. When the 
  +If the lookup fails, the expanded string in this example is empty. When the
   expansion of \data\ results in an empty string, the router declines. A forced
   expansion failure also causes the router to decline; other expansion failures
   cause delivery to be deferred.
  -.nem


A configuration using \file\ is commonly used for handling users' \(.forward)\
files, like this:
@@ -15153,8 +15011,8 @@
\(.forward)\ files, as in the example above. There are two reasons for this:
.numberpars $.
When Exim is receiving an incoming SMTP message from a remote host, it is
-running under the Exim uid, not as root.
-No additional groups are set up, even if the Exim uid is a member of other
+running under the Exim uid, not as root.
+No additional groups are set up, even if the Exim uid is a member of other
groups (that is, the \*initgroups()*\ function is not run).
Exim is unable to change uid to read the file as the user, and it may not be
able to read it as the Exim user. So in practice the router may not be able to
@@ -15185,10 +15043,10 @@
Otherwise, the data must be a comma-separated list of redirection items, as
described in the next section.
.endp
-When a message is redirected to a file (a `mail folder'), the file name given
-in a non-filter redirection list must always be an absolute path. A filter may
-generate a relative path -- how this is handled depends on the transport's
-configuration. See section ~~SECTfildiropt for a discussion of this issue for
+When a message is redirected to a file (a `mail folder'), the file name given
+in a non-filter redirection list must always be an absolute path. A filter may
+generate a relative path -- how this is handled depends on the transport's
+configuration. See section ~~SECTfildiropt for a discussion of this issue for
the \%appendfile%\ transport.


@@ -15214,11 +15072,11 @@
(but never to enclose the entire address). In the following description, `item'
refers to what remains after any surrounding double quotes have been removed.

-\**Warning**\: If you use an Exim expansion to construct a redirection address,
-and the expansion contains a reference to \$local@_part$\, you should make use
-of the \quote\ expansion operator, in case the local part contains special
-characters. For example, to redirect all mail for the domain
-\*obsolete.example*\, retaining the existing local part, you could use this
+\**Warning**\: If you use an Exim expansion to construct a redirection address,
+and the expansion contains a reference to \$local@_part$\, you should make use
+of the \quote\ expansion operator, in case the local part contains special
+characters. For example, to redirect all mail for the domain
+\*obsolete.example*\, retaining the existing local part, you could use this
setting:
.display asis
data = ${quote:$local_part}@???
@@ -15233,9 +15091,7 @@
A redirection item may safely be the same as the address currently under
consideration. This does not cause a routing loop, because a router is
automatically skipped if any ancestor of the address that is being processed
-.em
-is the same as the current address and was processed by the current router.
-.nem
+is the same as the current address and was processed by the current router.
Such an address is therefore passed to the following routers, so it is handled
as if there were no redirection. When making this loop-avoidance test, the
complete local part, including any prefix or suffix, is used.
@@ -15261,23 +15117,21 @@
addresses are qualified using the value in \qualify@_recipient\, but you can
force the incoming domain to be used by setting \qualify__preserve@_domain\.

-Care must be taken if there are alias names for local users.
-.em
+Care must be taken if there are alias names for local users.
Consider an MTA handling a single local domain where the system alias file
contains:
.display asis
Sam.Reman: spqr
.endd
Now suppose that Sam (whose login id is \*spqr*\) wants to save copies of
-messages in the local mailbox, and also forward copies elsewhere. He creates
+messages in the local mailbox, and also forward copies elsewhere. He creates
this forward file:
.display asis
Sam.Reman, spqr@???
.endd
With these settings, an incoming message addressed to \*Sam.Reman*\ fails. The
\%redirect%\ router for system aliases does not process \*Sam.Reman*\ the
-second time round, because it has previously routed it,
-.nem
+second time round, because it has previously routed it,
and the following routers presumably cannot handle the alias. The forward file
should really contain
.display asis
@@ -15298,11 +15152,9 @@
.index address redirection||to pipe
An item is treated as a pipe command if it begins with `|' and does not parse
as a valid RFC 2822 address that includes a domain. A transport for running the
-command must be specified by the \pipe@_transport\ option.
-.em
+command must be specified by the \pipe@_transport\ option.
Normally, either the router or the transport specifies a user and a group under
which to run the delivery. The default is to use the Exim user and group.
-.nem

Single or double quotes can be used for enclosing the individual arguments of
the pipe command; no interpretation of escapes is done for single quotes. If
@@ -15334,14 +15186,12 @@
forward slash character, it is interpreted as a directory name rather than a
file name, and \directory@_transport\ is used instead.

-.em
Normally, either the router or the transport specifies a user and a group under
which to run the delivery. The default is to use the Exim user and group.
.index \(/dev/null)\
However, if a redirection item is the path \(/dev/null)\, delivery to it is
bypassed at a high level, and the log entry shows `$*$$*$bypassed$*$$*$'
instead of a transport name. In this case the user and group are not used.
-.nem
.nextp
.index included address list
.index address redirection||included external list
@@ -15350,8 +15200,8 @@
:include:<<path name>>
.endd
a list of further items is taken from the given file and included at that
-point.
-\**Note**\: such a file can not be a filter file; it is just an out-of-line
+point.
+\**Note**\: such a file can not be a filter file; it is just an out-of-line
addition to the list.
The items in the included list are separated by commas or newlines and are not
subject to expansion. If this is the first item in an alias list in an
@@ -15378,10 +15228,10 @@
message is generated. This has the same effect as specifing \(/dev/null)\, but
can be independently disabled.

-\**Warning**\: If \":blackhole:"\ appears anywhere in a redirection list, no
-delivery is done for the original local part, even if other redirection items
-are present. If you are generating a multi-item list (for example, by reading a
-database) and need the ability to provide a no-op item, you must use
+\**Warning**\: If \":blackhole:"\ appears anywhere in a redirection list, no
+delivery is done for the original local part, even if other redirection items
+are present. If you are generating a multi-item list (for example, by reading a
+database) and need the ability to provide a no-op item, you must use
\(/dev/null)\.

.nextp
@@ -15405,7 +15255,7 @@
X.Employee: :fail: Gone away, no forwarding address
.endd
In the case of an address that is being verified from an ACL or as the subject
-of a \\VRFY\\ command, the text is included in the SMTP error response by
+of a \\VRFY\\ command, the text is included in the SMTP error response by
default. In an ACL, an explicitly provided message overrides the default, but
the default message is available in the variable \$acl@_verify@_message$\ and
can therefore be included in a custom message if this is desired. Exim sends a
@@ -15529,14 +15379,12 @@
configuration file for handling users' \(.forward)\ files. It is recommended
for this use of the \%redirect%\ router.

-.em
When \check@_ancestor\ is set, if a generated address (including the domain) is
the same as any ancestor of the current address, it is replaced by a copy of
the current address. This helps in the case where local part A is aliased to B,
-and B has a \(.forward)\ file pointing back to A. For example, within a single
+and B has a \(.forward)\ file pointing back to A. For example, within a single
domain, the local part `Joe.Bloggs' is aliased to `jb' and \(@~jb/.forward)\
contains:
-.nem
.display
@\Joe.Bloggs, <<other item(s)>>
.endd
@@ -15612,7 +15460,7 @@
A \%redirect%\ router sets up a direct delivery to a file when a path name not
ending in a slash is specified as a new `address'. The transport used is
specified by this option, which, after expansion, must be the name of a
-configured transport.
+configured transport.
This should normally be an \%appendfile%\ transport.
When it is running, the file name is in \$address@_file$\.

@@ -15727,8 +15575,8 @@
.index address redirection||one-time expansion
Sometimes the fact that Exim re-evaluates aliases and reprocesses redirection
files each time it tries to deliver a message causes a problem
-when one or more of the generated addresses fails be delivered at the first
-attempt. The problem is not one of duplicate delivery -- Exim is clever enough
+when one or more of the generated addresses fails be delivered at the first
+attempt. The problem is not one of duplicate delivery -- Exim is clever enough
to handle that -- but of what happens when the redirection list changes during
the time that the message is on Exim's queue. This is particularly true in the
case of mailing lists, where new subscribers might receive copies of messages
@@ -15770,20 +15618,18 @@
list is in addition to the local user's primary group when \check@_local@_user\
is set. See \check@_group\ above.

-.em
.conf qualify@_domain string$**$ unset
If this option is set and an unqualified address (one without a domain) is
generated, it is qualified with the domain specified by expanding this string,
instead of the global setting in \qualify@_recipient\. If the expansion fails,
the router declines. If you want to revert to the default, you can have the
expansion generate \$qualify@_recipient$\.
-.nem

.conf pipe@_transport string$**$ unset
A \%redirect%\ router sets up a direct delivery to a pipe when a string starting
with a vertical bar character is specified as a new `address'. The transport
used is specified by this option, which, after expansion, must be the name of a
-configured transport.
+configured transport.
This should normally be a \%pipe%\ transport.
When the transport is run, the pipe command is in \$address@_pipe$\.

@@ -15792,11 +15638,9 @@
.index preserving domain in redirection
.index address redirection||domain, preserving
If this is set and an unqualified address (one without a domain) is generated,
-it is qualified with the domain of the
-.em
+it is qualified with the domain of the
parent address (the immediately preceding ancestor) instead of the local
\qualify@_domain\ or global \qualify@_recipient\ value.
-.nem

.conf repeat@_use boolean true
If this option is set false, the router is skipped for a child address that has
@@ -15809,7 +15653,7 @@
A \%redirect%\ router sets up an automatic reply when a \mail\ or \vacation\
command is used in a filter file. The transport used is specified by this
option, which, after expansion, must be the name of a configured transport.
-This should normally be an \%autoreply%\ transport. Other transports are
+This should normally be an \%autoreply%\ transport. Other transports are
unlikely to do anything sensible or useful.

.conf rewrite boolean true
@@ -15845,8 +15689,8 @@
so it is passed to the following routers.

.index Sieve filter||syntax errors in
-Currently, any syntax errors in a Sieve filter file cause the `keep' action to
-occur. The values of \skip@_syntax@_errors\, \syntax@_errors@_to\, and
+Currently, any syntax errors in a Sieve filter file cause the `keep' action to
+occur. The values of \skip@_syntax@_errors\, \syntax@_errors@_to\, and
\syntax@_errors@_text\ are not used.

   \skip@_syntax@_errors\ can be used to specify that errors in users' forward
  @@ -15941,7 +15785,7 @@
   local_users:
     driver = accept
     check_local_user
  -  transport = group_delivery  
  +  transport = group_delivery


# Transports ...
# This transport overrides the group
@@ -16045,10 +15889,8 @@
logged, and delivery is deferred.

.conf disable@_logging boolean false
-If this option is set true, nothing is logged for any
-.em
-deliveries by the transport or for any
-.nem
+If this option is set true, nothing is logged for any
+deliveries by the transport or for any
transport errors. You should not set this option unless you really, really know
what you are doing.

@@ -16056,8 +15898,8 @@
.index testing||variables in drivers
If this option is set and debugging is enabled (see the \-d-\ command line
option), the string is expanded and included in the debugging output when the
-transport is run.
-If expansion of the string fails, the error message is written to the debugging
+transport is run.
+If expansion of the string fails, the error message is written to the debugging
output, and Exim carries on processing.
This facility is provided to help with checking out the values of variables and
so on when debugging driver configurations. For example, if a \headers@_add\
@@ -16132,7 +15974,7 @@
headers_remove = return-receipt-to:acknowledge-to
.endd
Any existing headers matching those names are not included in any message that
-is transmitted by the transport.
+is transmitted by the transport.
If the result of the expansion is an empty string, or if the expansion is
forced to fail, no action is taken. Other expansion failures are treated as
errors and cause the delivery to be deferred.
@@ -16192,7 +16034,7 @@
This option controls the size of messages passed through the transport. It is
expanded before use; the result of the expansion must be a sequence of digits,
optionally followed by K or M.
-If the expansion fails for any reason, including forced failure, or if the
+If the expansion fails for any reason, including forced failure, or if the
result is not of the required form, delivery is deferred.
If the value is greater than zero and the size of a message exceeds this
limit, the address is failed. If there is any chance that the resulting bounce
@@ -16261,12 +16103,10 @@
option can be used to support VERP (Variable Envelope Return Paths) -- see
chapter ~~CHAPSMTP.

-\**Note**\: If a delivery error is detected locally,
-.em
+\**Note**\: If a delivery error is detected locally,
including the case when a remote server rejects a message at SMTP time,
the bounce message is not sent to the value of this option, but to the
previously set errors address (which defaults to the incoming sender address).
-.nem


.conf return@_path@_add boolean false
@@ -16295,7 +16135,7 @@
\shadow@_condition\ is unset, or its expansion does not result in the empty
string or one of the strings `0' or `no' or `false', the message is also passed
to the shadow transport, with the same delivery address or addresses.
-If expansion fails, no action is taken except that non-forced expansion
+If expansion fails, no action is taken except that non-forced expansion
failures cause a log line to be written.

The result of the shadow transport is discarded and does not affect the
@@ -16378,8 +16218,8 @@

.conf transport@_filter@_timeout time 5m
.index transport||filter, timeout
-When Exim is reading the output of a transport filter, it a applies a timeout
-that can be set by this option. Exceeding the timeout is treated as a
+When Exim is reading the output of a transport filter, it a applies a timeout
+that can be set by this option. Exceeding the timeout is treated as a
temporary delivery failure.


@@ -16392,11 +16232,9 @@
associated group is taken as the value of the gid to be used if the \group\
option is not set.

-.em
For deliveries that use local transports, a user and group are normally
specified explicitly or implicitly (for example, as a result of
\check@_local@_user\) by the router or transport.
-.nem

.index hints database||access by remote transport
For remote transports, you should leave this option unset unless you really are
@@ -16438,8 +16276,8 @@
In an \%lmtp%\ transport, when delivering over `local SMTP' to some process,
a single copy saves time, and is the normal way LMTP is expected to work.
.nextp
-In a \%pipe%\ transport, when passing the message
-to a scanner program or
+In a \%pipe%\ transport, when passing the message
+to a scanner program or
to some other delivery mechanism such as UUCP, multiple recipients may be
acceptable.
.endp
@@ -16464,8 +16302,8 @@
If \batch@_id\ is set, it is expanded for each address, and only those
addresses with the same expanded value are batched. This allows you to specify
customized batching conditions.
-Failure of the expansion for any reason, including forced failure, disables
-batching, but it does not stop the delivery from taking place.
+Failure of the expansion for any reason, including forced failure, disables
+batching, but it does not stop the delivery from taking place.
.nextp
Batched addresses must also have the same errors address (where to send
delivery errors), the same header additions and removals, the same user and
@@ -16490,15 +16328,15 @@
\use@_bsmtp\ option, because it always delivers using the SMTP protocol.

.index \%pipe%\ transport||with multiple addresses
-If you are not using BSMTP, but are using a \%pipe%\ transport, you can include
-\$pipe@_addresses$\ as part of the command. This is not a true variable; it is
-a bit of magic that causes each of the recipient addresses to be inserted into
-the command as a separate argument. This provides a way of accessing all the
+If you are not using BSMTP, but are using a \%pipe%\ transport, you can include
+\$pipe@_addresses$\ as part of the command. This is not a true variable; it is
+a bit of magic that causes each of the recipient addresses to be inserted into
+the command as a separate argument. This provides a way of accessing all the
addresses that are being delivered in the batch.

If you are using a batching \%appendfile%\ transport without \use@_bsmtp\, the
only way to preserve the recipient addresses is to set the \envelope@_to@_add\
-option. This causes an ::Envelope-to:: header line to be added to the message,
+option. This causes an ::Envelope-to:: header line to be added to the message,
containing all the recipients.


@@ -16547,13 +16385,13 @@
\%appendfile%\ is most commonly used for local deliveries to users' mailboxes.
However, it can also be used as a pseudo-remote transport for putting messages
into files for remote delivery by some means other than Exim. `Batch SMTP'
-format is often used in this case (see the \use@_bsmtp\ option).
+format is often used in this case (see the \use@_bsmtp\ option).


.section The file and directory options
.rset SECTfildiropt "~~chapter.~~section"
-The \file\ option specifies a single file, to which the message is appended;
-the \directory\ option specifies a directory, in which a new file containing
+The \file\ option specifies a single file, to which the message is appended;
+the \directory\ option specifies a directory, in which a new file containing
the message is created. Only one of these two options can be set, and for
normal deliveries to mailboxes, one of them \*must*\ be set.

@@ -16566,16 +16404,16 @@
operation. There are two cases:
.numberpars $.
If neither \file\ nor \directory\ is set, the redirection operation
-must specify an absolute path (one that begins with \"/"\). This is the most
-common case when users with local accounts use filtering to sort mail into
+must specify an absolute path (one that begins with \"/"\). This is the most
+common case when users with local accounts use filtering to sort mail into
different folders. See for example, the \%address@_file%\ transport in the
default configuration. If the path ends with a slash, it is assumed to be the
-name of a directory. A delivery to a directory can also be forced by setting
+name of a directory. A delivery to a directory can also be forced by setting
\maildir@_format\ or \mailstore@_format\.
.nextp
If \file\ or \directory\ is set for a delivery from a redirection, it is used
to determine the file or directory name for the delivery. Normally, the
-contents of \$address@_file$\ are used in some way in the string expansion.
+contents of \$address@_file$\ are used in some way in the string expansion.
.endp

   .index Sieve filter||configuring \%appendfile%\
  @@ -16588,13 +16426,13 @@
   .endd
   or Sieve filter commands of the form:
   .display asis
  -require "fileinto"; 
  +require "fileinto";
   fileinto "folder23";
   .endd
   In this situation, the expansion of \file\ or \directory\ in the transport must
  -transform the relative path into an appropriate absolute file name. In the case 
  -of Sieve filters, the name \*inbox*\ must be handled. It is the name that is 
  -used as a result of a `keep' action in the filter. This example shows one way 
  +transform the relative path into an appropriate absolute file name. In the case
  +of Sieve filters, the name \*inbox*\ must be handled. It is the name that is
  +used as a result of a `keep' action in the filter. This example shows one way
   of handling this requirement:
   .display asis
   file = ${if eq{$address_file}{inbox} \
  @@ -16605,7 +16443,7 @@
               }} \
          }
   .endd
  -With this setting of \file\, \*inbox*\ refers to the standard mailbox location, 
  +With this setting of \file\, \*inbox*\ refers to the standard mailbox location,
   absolute paths are used without change, and other folders are in the \(mail)\
   directory within the home directory.


@@ -16645,8 +16483,8 @@

.conf batch@_id string$**$ unset
See the description of local delivery batching in chapter ~~CHAPbatching.
-However, batching is automatically disabled for \%appendfile%\ deliveries that
-happen as a result of forwarding or aliasing or other redirection directly to a
+However, batching is automatically disabled for \%appendfile%\ deliveries that
+happen as a result of forwarding or aliasing or other redirection directly to a
file.

.conf batch@_max integer 1
@@ -16674,7 +16512,7 @@
If \use@_bsmtp\ is set the values of \check@_string\ and \escape@_string\ are
forced to `.' and `..' respectively, and any settings in the configuration are
ignored. Otherwise, they default to `From ' and `>From ' when the \file\ option
-is set, and unset when
+is set, and unset when
any of the \directory\, \maildir\, or \mailstore\ options are set.

The default settings, along with \message@_prefix\ and \message@_suffix\, are
@@ -16858,7 +16696,6 @@
\\SUPPORT@_MAILDIR\\ is present in \(Local/Makefile)\. See section
~~SECTmaildirdelivery below for further details.

-.em
.conf maildir@_quota@_directory@_regex string "See below"
.index maildir format||quota, directories included in
.index quota||maildir, directories included in
@@ -16869,7 +16706,7 @@
maildir_quota_directory_regex = ^(?:cur|new|\..*)$
.endd
which includes the \(cur)\ and \(new)\ directories, and any maildir++ folders
-(directories whose names begin with a dot). If you want to exclude the
+(directories whose names begin with a dot). If you want to exclude the
\(Trash)\
folder from the count (as some sites do), you need to change this setting to
.display asis
@@ -16877,7 +16714,6 @@
.endd
This uses a negative lookahead in the regular expression to exclude the
directory whose name is \(.Trash)\.
-.nem

.conf maildir@_retries integer 10
This option specifies the number of times to retry when writing a file in
@@ -16922,7 +16758,7 @@

\**Note**\: The \message@_prefix\ and \message@_suffix\ options are not
automatically changed by the use of \mbx@_format\. They should normally be set
-empty when using MBX format, so this option almost always appears in this
+empty when using MBX format, so this option almost always appears in this
combination:
.display asis
mbx_format = true
@@ -16988,15 +16824,13 @@
or to the total space used in the directory tree when the \directory\ option is
set. In the latter case, computation of the space used is expensive, because
all the files in the directory (and any sub-directories) have to be
-individually inspected and their sizes summed.
-.em
+individually inspected and their sizes summed.
(See \quota@_size@_regex\ and \maildir@_use@_size@_file\ for ways to avoid this
in environments where users have no shell access to their mailboxes).

As there is no interlock against two simultaneous deliveries into a
multi-file mailbox, it is possible for the quota to be overrun in this case.
For single-file mailboxes, of course, an interlock is a necessity.
-.nem

A file's size is taken as its \*used*\ value. Because of blocking effects, this
may be a lot less than the actual amount of disk space allocated to the file.
@@ -17013,9 +16847,7 @@
fails because this quota is exceeded, the handling of the error is as for
system quota failures.

-.em
-\**Note**\: A value of zero is interpreted as `no quota'.
-.nem
+\**Note**\: A value of zero is interpreted as `no quota'.

By default, Exim's quota checking mimics system quotas, and restricts the
mailbox to the specified maximum size, though the value is not accurate to the
@@ -17059,8 +16891,8 @@
maildir_tag = ,S=$message_size
quota_size_regex = ,S=(\d+)
.endd
-The regular expression should not assume that the length is at the end of the
-file name (even though \maildir@_tag\ puts it there) because maildir MUAs
+The regular expression should not assume that the length is at the end of the
+file name (even though \maildir@_tag\ puts it there) because maildir MUAs
sometimes add other information onto the ends of message file names.

.conf quota@_warn@_message string$**$ "see below"
@@ -17119,7 +16951,7 @@
The contents of the \message@_prefix\ and \message@_suffix\ options are written
verbatim, so must contain their own carriage return characters if these are
needed. In cases where these options have non-empty defaults, the values end
-with a single linefeed, so they
+with a single linefeed, so they
must
be changed to end with \"@\r@\n"\ if \use@_crlf\ is set.

@@ -17286,7 +17118,7 @@
.index locking files
Once the file is open, unless both \use@_fcntl@_lock\ and \use@_flock@_lock\
are false, it is locked using \*fcntl()*\ or \*flock()*\ or both. If
-\use@_mbx@_lock\ is false, an exclusive lock is requested in each case.
+\use@_mbx@_lock\ is false, an exclusive lock is requested in each case.
However, if \use@_mbx@_lock\ is true,
Exim takes out a shared lock on the open file,
and an exclusive lock on the file whose name is
@@ -17323,11 +17155,11 @@
.index delivery||to single file
.index `From' line
When the \directory\ option is set instead of \file\, each message is delivered
-into a newly-created file or set of files. When \%appendfile%\ is activated
-directly from a \%redirect%\ router, neither \file\ nor \directory\ is normally
-set, because the path for delivery is supplied by the router. (See for example,
-the \%address@_file%\ transport in the default configuration.) In this case,
-delivery is to a new file if either the path name ends in \"/"\, or the
+into a newly-created file or set of files. When \%appendfile%\ is activated
+directly from a \%redirect%\ router, neither \file\ nor \directory\ is normally
+set, because the path for delivery is supplied by the router. (See for example,
+the \%address@_file%\ transport in the default configuration.) In this case,
+delivery is to a new file if either the path name ends in \"/"\, or the
\maildir@_format\ or \mailstore@_format\ option is set.

No locking is required while writing the message to a new file, so the various
@@ -17338,9 +17170,9 @@
\check@_string\, \message@_prefix\, and \message@_suffix\ are all unset when
any of \directory\, \maildir@_format\, or \mailstore@_format\ is set.

-If Exim is required to check a \quota\ setting, it adds up the sizes of all the
-files in the delivery directory by default. However, you can specify a
-different directory by setting \quota@_directory\. Also, for maildir deliveries
+If Exim is required to check a \quota\ setting, it adds up the sizes of all the
+files in the delivery directory by default. However, you can specify a
+different directory by setting \quota@_directory\. Also, for maildir deliveries
(see below) the \(maildirfolder)\ convention is honoured.


@@ -17366,7 +17198,7 @@
.index maildir format||description of
If the \maildir@_format\ option is true, Exim delivers each message by writing
it to a file whose name is \(tmp/<<stime>>.H<<mtime>>P<<pid>>.<<host>>)\ in the
-given directory. If the delivery is successful, the file is renamed into the
+given directory. If the delivery is successful, the file is renamed into the
\(new)\ subdirectory.

In the file name, <<stime>> is the current time of day in seconds, and
@@ -17389,14 +17221,14 @@


.section Using tags to record message sizes
-If \maildir@_tag\ is set, the string is expanded for each delivery.
+If \maildir@_tag\ is set, the string is expanded for each delivery.
When the maildir file is renamed into the \(new)\ sub-directory, the
tag is added to its name. However, if adding the tag takes the length of the
name to the point where the test \*stat()*\ call fails with \\ENAMETOOLONG\\,
-the tag is dropped and the maildir file is created with no tag.
+the tag is dropped and the maildir file is created with no tag.

Tags can be used to encode the size of files in their names; see
-\quota@_size@_regex\ above for an example. The expansion of \maildir@_tag\
+\quota@_size@_regex\ above for an example. The expansion of \maildir@_tag\
happens after the message has been written. The value of the \$message@_size$\
variable is set to the number of bytes actually written. If the expansion is
forced to fail, the tag is ignored, but a non-forced failure causes delivery to
@@ -17406,7 +17238,6 @@
colon is inserted.


-.em
.section Using a maildirsize file
.index quota||in maildir delivery
.index maildir format||\(maildirsize)\ file
@@ -17428,9 +17259,8 @@
file is maintained (with a zero quota setting), but no quota is imposed.

A regular expression is available for controlling which directories in the
-maildir participate in quota calculations. See the description of the
+maildir participate in quota calculations. See the description of the
\maildir@_quota@_directory@_regex\ option above for details.
-.nem


.section Mailstore delivery
@@ -17496,7 +17326,7 @@
The parameters of the message to be sent can be specified in the configuration
by options described below. However, these are used only when the address
passed to the transport does not contain its own reply information. When the
-transport is run as a consequence of a
+transport is run as a consequence of a
\mail\
or \vacation\ command in a filter file, the parameters of the message are
supplied by the filter, and passed with the address. The transport's options
@@ -17520,7 +17350,7 @@

Non-printing characters are not permitted in the header lines generated for the
message that \%autoreply%\ creates, with the exception of newlines that are
-immediately followed by whitespace. If any non-printing characters are found,
+immediately followed by whitespace. If any non-printing characters are found,
the transport defers.
Whether characters with the top bit set count as printing characters or not is
controlled by the \print@_topbitchars\ global option.
@@ -17579,7 +17409,7 @@
If either the log file or the `once' file has to be created, this mode is used.

.conf once string$**$ unset
-This option names a file or DBM database in which a record of each
+This option names a file or DBM database in which a record of each
::To:: recipient is kept when the message is specified by the transport.
\**Note**\: This does not apply to ::Cc:: or ::Bcc:: recipients.
If \once@_file@_size\ is not set, a DBM database is used, and it is allowed to
@@ -17682,12 +17512,12 @@
input and output to operate the LMTP protocol.

.conf socket string$**$ unset
-This option must be set if \command\ is not set. The result of expansion must
-be the name of a Unix domain socket. The transport connects to the socket and
+This option must be set if \command\ is not set. The result of expansion must
+be the name of a Unix domain socket. The transport connects to the socket and
delivers the message to it using the LMTP protocol.

.conf timeout time 5m
-The transport is aborted if the created process
+The transport is aborted if the created process
or Unix domain socket
does not respond to LMTP commands or message input within this timeout.

@@ -17732,8 +17562,8 @@
command itself. The \command\ option on the transport is ignored.
.endp

-The \%pipe%\ transport is a non-interactive delivery method. Exim can also
-deliver messages over pipes using the LMTP interactive protocol. This is
+The \%pipe%\ transport is a non-interactive delivery method. Exim can also
+deliver messages over pipes using the LMTP interactive protocol. This is
implemented by the \%lmtp%\ transport.

In the case when \%pipe%\ is run as a consequence of an entry in a local user's
@@ -17757,9 +17587,9 @@
script, it normally means that the script was terminated by a signal whose
value is the return code minus 128.

-If Exim is unable to run the command (that is, if \*execve()*\ fails), the
-return code is set to 127. This is the value that a shell returns if it is
-asked to run a non-existent command. The wording for the log line suggests that
+If Exim is unable to run the command (that is, if \*execve()*\ fails), the
+return code is set to 127. This is the value that a shell returns if it is
+asked to run a non-existent command. The wording for the log line suggests that
a non-existent command may be the problem.

The \return@_output\ option can affect the result of a pipe delivery. If it is
@@ -17949,7 +17779,7 @@
.conf ignore@_status boolean false
If this option is true, the status returned by the subprocess that is set up to
run the command is ignored, and Exim behaves as if zero had been returned.
-Otherwise, a non-zero status
+Otherwise, a non-zero status
or termination by signal
causes an error return from the transport unless the status value is one of
those listed in \temp@_errors\; these cause the delivery to be deferred and
@@ -18010,7 +17840,7 @@
This option specifies the string that is set up in the \\PATH\\ environment
variable of the subprocess. If the \command\ option does not yield an absolute
path name, the command is sought in the \\PATH\\ directories, in the usual way.
-\**Warning**\: This does not apply to a command specified as a transport
+\**Warning**\: This does not apply to a command specified as a transport
filter.

.conf pipe@_as@_creator boolean false
@@ -18046,10 +17876,8 @@
.conf temp@_errors "string list" "see below"
.index \%pipe%\ transport||temporary failure
This option contains either a colon-separated list of numbers, or a single
-asterisk. If \ignore@_status\ is false
-.em
+asterisk. If \ignore@_status\ is false
and \return@_output\ is not set,
-.nem
and the command exits with a non-zero return code, the failure is treated as
temporary and the delivery is deferred if the return code matches one of the
numbers, or if the setting is a single asterisk. Otherwise, non-zero return
@@ -18372,7 +18200,7 @@

.conf gethostbyname boolean false
If this option is true when the \hosts\ and/or \fallback@_hosts\ options are
-being used, names are looked up using \*gethostbyname()*\
+being used, names are looked up using \*gethostbyname()*\
(or \*getipnodebyname()*\ when available)
instead of using the DNS. Of course, that function may in fact use the DNS, but
it may also consult other sources of information such as \(/etc/hosts)\.
@@ -18429,9 +18257,7 @@
.index MX record||maximum tried
This option limits the number of IP addresses that are tried for any one
delivery
-.em
in cases where there are temporary delivery errors.
-.nem
Section ~~SECTvalhosmax describes in detail how the value of this option is
used.

@@ -18486,7 +18312,7 @@
.index TLS||requiring for certain servers
Exim will insist on using a TLS session when delivering to any host that
matches this list. See chapter ~~CHAPTLS for details of TLS.
-\**Note**\: This option affects outgoing mail only. To insist on TLS for
+\**Note**\: This option affects outgoing mail only. To insist on TLS for
incoming messages, use an appropriate ACL.

.index authentication||optional in client
@@ -18504,11 +18330,9 @@
call. The variables \$host$\ and \$host@_address$\ refer to the host to which a
connection is about to be made during the expansion of the string. Forced
expansion failure, or an empty string result causes the option to be ignored.
-Otherwise, after expansion,
-.em
+Otherwise, after expansion,
the string must be a list of IP addresses, colon-separated by default, but the
separator can be changed in the usual way.
-.nem
For example:
.display asis
interface = <; 192.168.123.123 ; 3ffe:ffff:836f::fe86:a061
@@ -18552,7 +18376,7 @@
it begins with a digit it is taken as a port number; otherwise it is looked up
using \*getservbyname()*\. The default value is normally `smtp', but if
\protocol\ is set to `lmtp', the default is `lmtp'.
-If the expansion fails, or if a port number cannot be found, delivery is
+If the expansion fails, or if a port number cannot be found, delivery is
deferred.


@@ -18625,26 +18449,24 @@
and address of the server during the expansion. See chapter ~~CHAPTLS for
details of TLS.

-\**Note**\: This option must be set if you want Exim to use TLS when sending
-messages as a client. The global option of the same name specifies the
-certificate for Exim as a server; it is not automatically assumed that the same
+\**Note**\: This option must be set if you want Exim to use TLS when sending
+messages as a client. The global option of the same name specifies the
+certificate for Exim as a server; it is not automatically assumed that the same
certificate should be used when Exim is operating as a client.

-.em
.conf tls@_crl string$**$ unset
.index TLS||client certificate revocation list
.index certificate||revocation list for client
This option specifies a certificate revocation list. The expanded value must
be the name of a file that contains a CRL in PEM format.
-.nem

.conf tls@_privatekey string$**$ unset
.index TLS||client private key, location of
The value of this option must be the absolute path to a file which contains the
client's private key, for use when sending a message over an encrypted
connection. The values of \$host$\ and \$host@_address$\ are set to the name
-and address of the server during the expansion.
-If this option is unset, the private key is assumed to be in the same file as
+and address of the server during the expansion.
+If this option is unset, the private key is assumed to be in the same file as
the certificate.
See chapter ~~CHAPTLS for details of TLS.

@@ -18652,18 +18474,16 @@
.index TLS||requiring specific ciphers
.index cipher||requiring specific
The value of this option must be a list of permitted cipher suites, for use
-when setting up an
-.em
-outgoing encrypted connection. (There is a global option of the same name for
+when setting up an
+outgoing encrypted connection. (There is a global option of the same name for
controlling incoming connections.)
-.nem
The values of \$host$\ and \$host@_address$\ are set to the name and address of
the server during the expansion. See chapter ~~CHAPTLS for details of TLS; note
that this option is used in different ways by OpenSSL and GnuTLS (see section
~~SECTreqciphsslgnu).

.conf tls@_tempfail@_tryclear boolean true
-When the server host is not in \hosts@_require@_tls\, and there is a problem in
+When the server host is not in \hosts@_require@_tls\, and there is a problem in
setting up a TLS session, this option determines whether or not Exim should try
to deliver the message unencrypted. If it is set false, delivery to the
current host is deferred; if there are other hosts, they are tried. If this
@@ -18694,7 +18514,7 @@
.index limit||hosts, maximum number tried
The \hosts@_max@_try\ option limits the number of hosts that are tried
for a single delivery. However, despite the term `host' in its name, the option
-actually applies to each IP address independently. In other words, a multihomed
+actually applies to each IP address independently. In other words, a multihomed
host is treated as several independent hosts, just as it is for retrying.

Many of the larger ISPs have multiple MX records which often point to
@@ -18704,7 +18524,7 @@
Trying every single IP address on such a long list does not seem sensible; if
several at the top of the list fail, it is reasonable to assume there is some
problem that is likely to affect all of them. Roughly speaking, the value of
-\hosts@_max@_try\ is the maximum number that are tried before deferring the
+\hosts@_max@_try\ is the maximum number that are tried before deferring the
delivery. However, the logic cannot be quite that simple.

Firstly, IP addresses that are skipped because their retry times have not
@@ -18720,7 +18540,7 @@
counted. This behaviour helps in the case of a domain with a retry rule that
hardly ever delays any hosts, as is now explained:

-Consider the case of a long list of hosts with one MX value, and a few with a
+Consider the case of a long list of hosts with one MX value, and a few with a
higher MX value. If \hosts@_max@_try\ is small (the default is 5) only a few
hosts at the top of the list are tried at first. With the default retry rule,
which specifies increasing retry times, the higher MX hosts are eventually
@@ -18779,12 +18599,10 @@
Others believe that life is not possible without it. Exim provides the
facility; you do not have to use it.

-.em
The main rewriting rules that appear in the `rewrite' section of the
configuration file are applied to addresses in incoming messages, both envelope
addresses and addresses in header lines. Each rule specifies the types of
address to which it applies.
-.nem

Rewriting of addresses in header lines applies only to those headers that
were received with the message, and, in the case of transport rewriting, those
@@ -18812,14 +18630,13 @@
\*fp42@@hitch.fict.example*\ becomes \*Ford.Prefect@@hitch.fict.example*\.
.endp

-.em
.section When does rewriting happen?
.index rewriting||timing of
.index ~~ACL||rewriting addresses in
Configured address rewriting can take place at several different stages of a
-message's processing.
+message's processing.

-At the start of an ACL for \\MAIL\\, the sender address may have been rewritten
+At the start of an ACL for \\MAIL\\, the sender address may have been rewritten
by a special SMTP-time rewrite rule (see section ~~SECTrewriteS), but no
ordinary rewrite rules have yet been applied. If, however, the sender address
is verified in the ACL, it is rewritten before verification, and remains
@@ -18834,10 +18651,10 @@
from the sender address when a recipient is verified. The address is rewritten
for the verification, but the rewriting is not remembered at this stage. The
value of \$local@_part$\ and \$domain$\ after verification are always the same
-as they were before (that is, they contain the unrewritten -- except for
+as they were before (that is, they contain the unrewritten -- except for
SMTP-time rewriting -- address).

-Once a message's header lines have been received, all the envelope recipient
+Once a message's header lines have been received, all the envelope recipient
addresses are permanently rewritten, and rewriting is also applied to the
addresses in the header lines (if configured).
.index \*local@_scan()*\ function||address rewriting, timing of
@@ -18847,7 +18664,6 @@
When an address is being routed, either for delivery or for verification,
rewriting is applied immediately to child addresses that are generated by
redirection, unless \no@_rewrite\ is set on the router.
-.nem

.index envelope sender, rewriting
.index rewriting||at transport time
@@ -18936,8 +18752,8 @@
single-item address list, which means that it is expanded before being tested
against the address.

-Domains in patterns should be given in lower case. Local parts in patterns are
-case-sensitive. If you want to do case-insensitive matching of local parts, you
+Domains in patterns should be given in lower case. Local parts in patterns are
+case-sensitive. If you want to do case-insensitive matching of local parts, you
can use a regular expression that starts with \"^(?i)"\.

.index numerical variables (\$1$\, \$2$\, etc)||in rewriting rules
@@ -19232,13 +19048,13 @@
alice@??? * F,24h,30m;
.endd
applies only to temporary failures involving the local part \alice\.
-In practice, almost all rules start with a domain name pattern without a local
+In practice, almost all rules start with a domain name pattern without a local
part.

   .index regular expressions||in retry rules
  -\**Warning**\: If you use a regular expression in a routing rule, it must match 
  -a complete address, not just a domain, because that is how regular expressions 
  -work in address lists. 
  +\**Warning**\: If you use a regular expression in a routing rule, it must match
  +a complete address, not just a domain, because that is how regular expressions
  +work in address lists.
   .display
   ^@\Nxyz@\d+@\.abc@\.example@$@\N        *  G,1h,10m,2     \Wrong\
   ^@\N[^@@]+@@xyz@\d+@\.abc@\.example@$@\N  *  G,1h,10m,2     \Right\
  @@ -19261,15 +19077,13 @@
   \retry@_use@_local@_part\ is set for the transport (it defaults true for all
   local transports).


-.em
When Exim is looking for a retry rule after a remote delivery attempt has
failed, what happens depends on the type of failure. After a 4\*xx*\ SMTP
response for a recipient address, the whole address is used when searching the
-retry rules. The rule that is found is used to create a retry time for the
+retry rules. The rule that is found is used to create a retry time for the
failing address.

For a temporary error that is not related to an individual address,
-.nem
(for example, a connection timeout), each line in the retry configuration is
checked twice. First, the name of the remote host is used as a domain name
(preceded by `*@@' when matching a regular expression). If this does not match
@@ -19314,7 +19128,7 @@
\*timeout@_connect@_MX*\: connection timeout from a host obtained from an MX
record
.nextp
-\*timeout@_connect@_A*\: connection timeout from a host not obtained from an MX
+\*timeout@_connect@_A*\: connection timeout from a host not obtained from an MX
record
.nextp
\*timeout@_connect*\: any connection timeout
@@ -19322,7 +19136,7 @@
\*timeout@_MX*\: any timeout from a host obtained from an MX
record
.nextp
-\*timeout@_A*\: any timeout from a host not obtained from an MX
+\*timeout@_A*\: any timeout from a host not obtained from an MX
record
.nextp
\*timeout*\: any timeout
@@ -19335,7 +19149,6 @@
been read for <<time>>. For example, \*quota@_4d*\ applies to a quota error
when the mailbox has not been read for four days.

-.em
.index mailbox||time of last read
\**Warning**\: It is not always possible to determine a `time of last read' for
a mailbox:
@@ -19343,16 +19156,15 @@
If the mailbox is a single file, the time of last access is used.
.nextp
.index maildir format||time of last read
-For a maildir delivery, the time of last modification of the \(new)\
-subdirectory is used. As the mailbox is over quota, no new files will be
-created in the \(new)\ subdirectory, so any change is assumed to be the result
+For a maildir delivery, the time of last modification of the \(new)\
+subdirectory is used. As the mailbox is over quota, no new files will be
+created in the \(new)\ subdirectory, so any change is assumed to be the result
of an MUA moving a new message to the \(cur)\ directory when it is first read.
.nextp
For other kinds of multi-file delivery, the time of last read cannot be
obtained, and so a retry rule that uses this type of error field is never
matched.
.endp
-.nem
.endp
The quota errors apply both to system-enforced quotas and to Exim's own quota
mechanism in the \%appendfile%\ transport. The \*quota*\ error also applies
@@ -19493,7 +19305,7 @@
.endd
the cutoff time is four days. Reaching the retry cutoff is independent of how
long any specific message has been failing; it is the length of continuous
-failure for the recipient address that counts.
+failure for the recipient address that counts.

When the cutoff time is reached for a local delivery, or for all the IP
addresses associated with a remote delivery, a subsequent delivery failure
@@ -19573,7 +19385,7 @@
.index \\AUTH\\||description of
Very briefly, the way SMTP authentication works is as follows:
.numberpars $.
-The server advertises a number of authentication \*mechanisms*\ in response to
+The server advertises a number of authentication \*mechanisms*\ in response to
the client's \\EHLO\\ command.
.nextp
The client issues an \\AUTH\\ command, naming a specific mechanism. The command
@@ -19682,8 +19494,8 @@
.conf server@_advertise@_condition string$**$ unset
When a server is about to advertise an authentication mechanism, the condition
is expanded. If it yields the empty string, `0', `no', or `false', the
-mechanism is not advertised.
-If the expansion fails, the mechanism is not advertised. If the failure was not
+mechanism is not advertised.
+If the expansion fails, the mechanism is not advertised. If the failure was not
forced, and was not caused by a lookup defer, the incident is logged.
See section ~~SECTauthexiser below for further discussion.

@@ -19692,7 +19504,7 @@
command line option), the string is expanded and included in the debugging
output when the authenticator is run as a server. This can help with checking
out the values of variables.
-If expansion of the string fails, the error message is written to the debugging
+If expansion of the string fails, the error message is written to the debugging
output, and Exim carries on processing.

.conf server@_set@_id string$**$ unset
@@ -19706,7 +19518,7 @@

.conf server@_mail@_auth@_condition string$**$ unset
This option allows a server to discard authenticated sender addresses supplied
-as part of \\MAIL\\ commands in SMTP connections that are authenticated by the
+as part of \\MAIL\\ commands in SMTP connections that are authenticated by the
driver on which \server__mail__auth@_condition\ is set. The option is not used
as part of the authentication process; instead its (unexpanded) value is
remembered for later use.
@@ -19719,11 +19531,11 @@
.rset SECTauthparamail "~~chapter.~~section"
.index authentication||sender, authenticated
.index \\AUTH\\||on \\MAIL\\ command
-When a client supplied an \\AUTH=\\ item on a \\MAIL\\ command, Exim applies
+When a client supplied an \\AUTH=\\ item on a \\MAIL\\ command, Exim applies
the following checks before accepting it as the authenticated sender of the
message:
.numberpars $.
-If the connection is not using extended SMTP (that is, \\HELO\\ was used rather
+If the connection is not using extended SMTP (that is, \\HELO\\ was used rather
than \\EHLO\\), the use of \\AUTH=\\ is a syntax error.
.nextp
If the value of the \\AUTH=\\ parameter is `@<@>', it is ignored.
@@ -19764,16 +19576,16 @@
.section Authentication on an Exim server
.rset SECTauthexiser "~~chapter.~~section"
.index authentication||on an Exim server
-When Exim receives an \\EHLO\\ command, it advertises the public names of those
-authenticators that are configured as servers, subject to the following
+When Exim receives an \\EHLO\\ command, it advertises the public names of those
+authenticators that are configured as servers, subject to the following
conditions:
.numberpars $.
The client host must match \auth@_advertise@_hosts\ (default $*$).
.nextp
-It the \server@_advertise@_condition\ option is set, its expansion must not
+It the \server@_advertise@_condition\ option is set, its expansion must not
yield the empty string, `0', `no', or `false'.
.endp
-The order in which the authenticators are defined controls the order in which
+The order in which the authenticators are defined controls the order in which
the mechanisms are advertised.

Some mail clients (for example, some versions of Netscape) require the user to
@@ -19795,7 +19607,7 @@
.display asis
server_advertise_condition = ${if eq{$tls_cipher}{}{no}{yes}}
.endd
-If the session is encrypted, \$tls@_cipher$\ is not empty, and so the expansion
+If the session is encrypted, \$tls@_cipher$\ is not empty, and so the expansion
yields `yes', which allows the advertisement to happen.

When an Exim server receives an \\AUTH\\ command from a client, it rejects it
@@ -19806,16 +19618,16 @@
.nextp
No authenticators are configured with server options; or
.nextp
-Expansion of \server@_advertise@_condition\ blocked the advertising of all the
+Expansion of \server@_advertise@_condition\ blocked the advertising of all the
server authenticators.
.endp

Otherwise, Exim runs the ACL specified by \acl@_smtp@_auth\ in order
to decide whether to accept the command. If \acl@_smtp@_auth\ is not set,
-\\AUTH\\ is accepted from any client host.
+\\AUTH\\ is accepted from any client host.

If \\AUTH\\ is not rejected by the ACL, Exim searches its configuration for a
-server authentication mechanism that was advertised in response to \\EHLO\\ and
+server authentication mechanism that was advertised in response to \\EHLO\\ and
that matches the one named in the \\AUTH\\ command. If it finds one, it runs
the appropriate authentication protocol, and authentication either succeeds or
fails. If there is no matching advertised mechanism, the \\AUTH\\ command is
@@ -19852,15 +19664,15 @@
.endd
Note the use of single quotes to prevent the shell interpreting the
backslashes, so that they can be interpreted by Perl to specify characters
-whose code value is zero.
+whose code value is zero.

\**Warning 1**\: If either of the user or password strings starts with an octal
digit, you must use three zeros instead of one after the leading backslash. If
you do not, the octal digit that starts your string will be incorrectly
interpreted as part of the code for the first character.

-\**Warning 2**\: If there are characters in the strings that Perl interprets
-specially, you must use a Perl escape to prevent them being misinterpreted. For
+\**Warning 2**\: If there are characters in the strings that Perl interprets
+specially, you must use a Perl escape to prevent them being misinterpreted. For
example, a command such as
.display asis
encode '\0user@???\0pas$$word'
@@ -19917,9 +19729,9 @@
.index \\AUTH\\||on \\MAIL\\ command
When Exim has authenticated itself to a remote server, it adds the \\AUTH\\
parameter to the \\MAIL\\ commands it sends, if it has an authenticated sender
-for the message.
-If the message came from a remote host, the authenticated sender is the one
-that was receiving on an incoming \\MAIL\\ command, provided that the incoming
+for the message.
+If the message came from a remote host, the authenticated sender is the one
+that was receiving on an incoming \\MAIL\\ command, provided that the incoming
connection was authenticated and the \server@_mail@_auth\ condition allowed the
authenticated sender to be retained. If a local process calls Exim to send a
message, the sender address that is built from the login name and
@@ -19990,8 +19802,8 @@
expanded and saved in \$authenticated@_id$\. For any other result, a temporary
error code is returned, with the expanded string as the error text.

-\**Warning**\: If you use a lookup in the expansion to find the user's
-password, be sure to make the authentication fail if the user is unknown.
+\**Warning**\: If you use a lookup in the expansion to find the user's
+password, be sure to make the authentication fail if the user is unknown.
There are good and bad examples at the end of the next section.


@@ -20000,7 +19812,7 @@
.index authentication||PLAIN mechanism
.index binary zero||in \%plaintext%\ authenticator
The PLAIN authentication mechanism (RFC 2595) specifies that three strings be
-sent as one item of data (that is, one combined string containing two NUL
+sent as one item of data (that is, one combined string containing two NUL
separators). The data is sent either as part of the \\AUTH\\ command, or
subsequently in response to an empty prompt from the server.

  @@ -20011,7 +19823,7 @@
   fixed_plain:
     driver = plaintext
     public_name = PLAIN
  -  server_prompts = : 
  +  server_prompts = :
     server_condition = \
       ${if and {{eq{$2}{username}}{eq{$3}{mysecret}}}{yes}{no}}
     server_set_id = $2
  @@ -20032,20 +19844,18 @@
   .display asis
   AUTH PLAIN
   .endd
  -to initiate authentication, in which case the server replies with an empty 
  +to initiate authentication, in which case the server replies with an empty
   prompt. The client must respond with the combined data string.


-.em
The data string is base64 encoded, as required by the RFC. This example,
when decoded, is \"<<NUL>>username<<NUL>>mysecret"\, where <<NUL>> represents a
zero byte. This is split up into three strings, the first of which is empty.
The \server@_condition\ option in the authenticator checks that the second two
are \"username"\ and \"mysecret"\ respectively.

-Having just one fixed user name and password, as in this example, is not very
-realistic, though for a small organization with only a handful of
+Having just one fixed user name and password, as in this example, is not very
+realistic, though for a small organization with only a handful of
authenticating clients it could make sense.
-.nem

   A more sophisticated instance of this authenticator could use the user name in
   \$2$\ to look up a password in a file or database, and maybe do an encrypted
  @@ -20060,12 +19870,12 @@
   which it then compares to the supplied password (\$3$\). Why is this example
   incorrect? It works fine for existing users, but consider what happens if a
   non-existent user name is given. The lookup fails, but as no success/failure
  -strings are given for the lookup, it yields an empty string. Thus, to defeat 
  -the authentication, all a client has to do is to supply a non-existent user 
  +strings are given for the lookup, it yields an empty string. Thus, to defeat
  +the authentication, all a client has to do is to supply a non-existent user
   name and an empty password. The correct way of writing this test is:
   .display asis
   server_condition = ${lookup{$2}dbm{/etc/authpwd}\
  -  {${if eq{$value}{$3}{yes}{no}}}{no}}    
  +  {${if eq{$value}{$3}{yes}{no}}}{no}}
   .endd
   In this case, if the lookup succeeds, the result is checked; if the lookup
   fails, authentication fails. If \crypteq\ is being used instead of \eq\, the
  @@ -20106,21 +19916,21 @@
     public_name = LOGIN
     server_prompts = Username:: : Password::
     server_condition = ${if ldapauth \
  -.newline     
  +.newline
       {user="cn=${quote_ldap_dn:$1},ou=people,o=example.org" \
       pass=${quote:$2} \
  -.newline     
  +.newline
       ldap://ldap.example.org/}{yes}{no}}
     server_set_id = uid=$1,ou=people,o=example.org
   .endd
   Note the use of the \quote@_ldap@_dn\ operator to correctly quote the DN for
   authentication. However, the basic \quote\ operator, rather than any of the
  -LDAP quoting operators, is the correct one to use for the password, because 
  -quoting is needed only to make the password conform to the Exim syntax. At the 
  +LDAP quoting operators, is the correct one to use for the password, because
  +quoting is needed only to make the password conform to the Exim syntax. At the
   LDAP level, the password is an uninterpreted string.



-.section Support for different kinds of authentication
+.section Support for different kinds of authentication
A number of string expansion features are provided for the purpose of
interfacing to different ways of user authentication. These include checking
traditionally encrypted passwords from \(/etc/passwd)\ (or equivalent), PAM,
@@ -20215,7 +20025,7 @@

   For example, the following authenticator checks that the user name given by the
   client is `ph10', and if so, uses `secret' as the password. For any other user
  -name, authentication fails.  
  +name, authentication fails.
   .display asis
   fixed_cram:
     driver = cram_md5
  @@ -20316,7 +20126,7 @@


   .conf server@_password string$**$ unset
   .index numerical variables (\$1$\, \$2$\, etc)||in \%spa%\ authenticator
  -This option is expanded, and the result must be the cleartext password for the 
  +This option is expanded, and the result must be the cleartext password for the
   authenticating user, whose name is at this point in \$1$\. For example:
   .display asis
   spa:
  @@ -20324,7 +20134,7 @@
     public_name = NTLM
     server_password = ${lookup{$1}lsearch{/etc/exim/spa_clearpass}}
   .endd
  -If the expansion is forced to fail, authentication fails. Any other expansion 
  +If the expansion is forced to fail, authentication fails. Any other expansion
   failure causes a temporary error code to be returned.


.endconf
@@ -20377,11 +20187,9 @@
.index TLS||on SMTP connection
.index OpenSSL
.index GnuTLS
-.em
Support for TLS (Transport Layer Security), formerly known as SSL (Secure
Sockets Layer), is implemented by making use of the OpenSSL library or the
GnuTLS library (Exim requires GnuTLS release 1.0 or later).
-.nem
There is no cryptographic code in the Exim distribution itself for implementing
TLS. In order to use this feature you must install OpenSSL or GnuTLS, and then
build a version of Exim that includes TLS support (see section
@@ -20432,13 +20240,11 @@

There are some differences in usage when using GnuTLS instead of OpenSSL:
.numberpars $.
-.em
-The \tls@_verify@_certificates\ option must contain the name of a file, not the
+The \tls@_verify@_certificates\ option must contain the name of a file, not the
name of a directory (for OpenSSL it can be either).
-.nem
.nextp
The \tls@_dhparam\ option is ignored, because early versions of GnuTLS had no
-facility for varying its Diffie-Hellman parameters. I understand that this has
+facility for varying its Diffie-Hellman parameters. I understand that this has
changed, but Exim has not been updated to provide this facility.
.nextp
GnuTLS uses RSA and D-H parameters that take a substantial amount of
@@ -20457,29 +20263,22 @@
Arranging this is easy; just delete the file when you want new values to be
computed.
.nextp
-.em
-Distinguished Name (DN) strings reported by the OpenSSL library use a slash for
-separating fields; GnuTLS uses commas, in accordance with RFC 2253. This
+Distinguished Name (DN) strings reported by the OpenSSL library use a slash for
+separating fields; GnuTLS uses commas, in accordance with RFC 2253. This
affects the value of the \$tls@_peerdn$\ variable.
-.nem
.nextp
OpenSSL identifies cipher suites using hyphens as separators, for example:
DES-CBC3-SHA. GnuTLS uses underscores, for example: RSA@_ARCFOUR@_SHA. What is
more, OpenSSL complains if underscores are present in a cipher list. To make
life simpler, Exim changes underscores to hyhens for OpenSSL and hyphens to
underscores for GnuTLS when processing lists of cipher suites in the
-.em
-\tls@_require@_ciphers\ options (the global option and the \%smtp%\ transport
+\tls@_require@_ciphers\ options (the global option and the \%smtp%\ transport
option).
-.nem
.nextp
-.em
The \tls@_require@_ciphers\ options operate differently, as described in the
following section.
-.nem
.endp

-.em
.section Requiring specific ciphers in OpenSSL and GnuTLS
.rset SECTreqciphsslgnu "~~chapter.~~section"
.index TLS||requiring specific ciphers
@@ -20563,7 +20362,6 @@

Unrecognized algorithms are ignored. In a client, the order of the list
specifies a preference order for the algorithms.
-.nem


.section Configuring an Exim server to use TLS
@@ -20608,8 +20406,8 @@
source of this background information, which is not Exim-specific. (There are a
few comments below in section ~~SECTcerandall.)

-\**Note**\: These options do not apply when Exim is operating as a client --
-they apply only in the case of a server. For a client, you must set the options
+\**Note**\: These options do not apply when Exim is operating as a client --
+they apply only in the case of a server. For a client, you must set the options
of the same name in an \%smtp%\ transport.

With just these options, Exim will work as a server with clients such as
@@ -20620,13 +20418,13 @@
tls_dhparam = /some/file/name
.endd
is set, the SSL library is initialized for the use of Diffie-Hellman ciphers
-with the parameters contained in the file. This increases the set of cipher
+with the parameters contained in the file. This increases the set of cipher
suites that the server supports. See the command
.display asis
openssl dhparam
.endd
for a way of generating this data.
-At present, \tls@_dhparam\ is used only when Exim is linked with OpenSSL. It is
+At present, \tls@_dhparam\ is used only when Exim is linked with OpenSSL. It is
ignored if GnuTLS is being used.

The strings supplied for these three options are expanded every time a client
@@ -20642,7 +20440,7 @@
incoming message (by default -- you can, of course, change this), and it is
also included in the log line that records a message's arrival, keyed by `X=',
unless the \tls@_cipher\ log selector is turned off.
-The \encrypted\ condition can be used to test for specific cipher suites in
+The \encrypted\ condition can be used to test for specific cipher suites in
ACLs.

The ACLs that run for subsequent SMTP commands can check the name of the cipher
@@ -20663,16 +20461,12 @@
Exim requests a certificate as part of the setup of the TLS session. The
contents of the certificate are verified by comparing it with a list of
expected certificates. These must be available in a file or,
-.em
for OpenSSL only (not GnuTLS), a directory, identified by
\tls@_verify@_certificates\.
-.nem

A file can contain multiple certificates, concatenated end to end. If a
-directory is used
-.em
-(OpenSSL only),
-.nem
+directory is used
+(OpenSSL only),
each certificate must be in a separate file, with a name (or a symbolic link)
of the form <<hash>>.0, where <<hash>> is a hash value constructed from the
certificate. You can compute the relevant hash by running the command
@@ -20702,7 +20496,6 @@
\received@_header@_text\ to change the ::Received:: header. When no certificate
is supplied, \$tls@_peerdn$\ is empty.

-.em
.section Revoked certificates
.index TLS||revoked certificates
.index revocation list
@@ -20713,7 +20506,6 @@
identically named option for the \%smtp%\ transport. In each case, the value of
the option is expanded and must then be the name of a file that contains a CRL
in PEM format.
-.nem

.section Configuring an Exim client to use TLS
.index cipher||logging
@@ -20755,18 +20547,16 @@
provide the client with a certificate, which is passed to the server if it
requests it. If the server is Exim, it will request a certificate only if
\tls@_verify@_hosts\ or \tls@_try@_verify@_hosts\ matches the client.
-\**Note**\: these options must be set in the \%smtp%\ transport for Exim to use
+\**Note**\: these options must be set in the \%smtp%\ transport for Exim to use
TLS when it is operating as a client. Exim does not assume that a server
certificate (set by the global options of the same name) should also be used
when operating as a client.

If \tls@_verify@_certificates\ is set, it must name a file or,
-.em
for OpenSSL only (not GnuTLS), a directory, that contains a collection of
expected server certificates. The client verifies the server's certificate
against this collection, taking into account any revoked certificates that are
in the list defined by \tls@_crl\.
-.nem

If
\tls@_require@_ciphers\ is set on the \%smtp%\ transport, it must contain a
@@ -20795,7 +20585,7 @@
if \\AUTH\\ is in use, before sending the next message.

The RFC is not clear as to whether or not an SMTP session continues in clear
-after TLS has been shut down, or whether TLS may be restarted again later, as
+after TLS has been shut down, or whether TLS may be restarted again later, as
just described. However, if the server is Exim, this shutdown and
reinitialization works. It is not known which (if any) other servers operate
successfully if the client closes a TLS session and continues with unencrypted
@@ -20805,12 +20595,12 @@
and delay other deliveries to that host.

To test for this case, Exim sends an \\EHLO\\ command to the server after
-closing down the TLS session. If this fails in any way, the connection is
+closing down the TLS session. If this fails in any way, the connection is
closed instead of being passed to a new delivery process, but no retry
information is recorded.

-There is also a manual override; you can set \hosts@_nopass@_tls\ on the
-\%smtp%\ transport to match those hosts for which Exim should not pass
+There is also a manual override; you can set \hosts@_nopass@_tls\ on the
+\%smtp%\ transport to match those hosts for which Exim should not pass
connections to new processes if TLS has been used.


@@ -20829,7 +20619,7 @@
Other parts of the \*modssl*\ documentation are also helpful, and have
links to further files.
Eric Rescorla's book, \*SSL and TLS*\, published by Addison-Wesley (ISBN
-0-201-61598-3), contains both introductory and more in-depth descriptions.
+0-201-61598-3), contains both introductory and more in-depth descriptions.
Some sample programs taken from the book are available from
.display rm
\?http://www.rtfm.com/openssl-examples/?\
@@ -20896,7 +20686,7 @@
.index policy control||access control lists
Access Control Lists (ACLs) are defined in a separate section of the run time
configuration file, headed by `begin acl'. Each ACL definition starts with a
-name, terminated by a colon. Here is a complete ACL section which contains just
+name, terminated by a colon. Here is a complete ACL section that contains just
one very small ACL:
.display asis
begin acl
@@ -20909,12 +20699,12 @@

The majority of ACLs are used to control Exim's behaviour when it receives
certain SMTP commands. This applies both to incoming TCP/IP connections, and
-when a local process submits a message over a pipe (using the \-bs-\ option).
-The most common use is for controlling which recipients are accepted in
-incoming messages. In addition, you can also define an ACL that is used to
-check local non-SMTP messages. The default configuration file contains an
-example of a realistic ACL for checking \\RCPT\\ commands. This is discussed in
-chapter ~~CHAPdefconfil.
+when a local process submits a message using SMTP by specifying the \-bs-\
+option. The most common use is for controlling which recipients are accepted
+in incoming messages. In addition, you can define an ACL that is used to check
+local non-SMTP messages. The default configuration file contains an example of
+a realistic ACL for checking \\RCPT\\ commands. This is discussed in chapter
+~~CHAPdefconfil.

   .section Testing ACLs
   The \-bh-\ command line option provides a way of testing your ACL configuration
  @@ -20928,15 +20718,18 @@
   In order to cause an ACL to be used, you have to name it in one of the relevant
   options in the main part of the configuration. These options are:
   .index \\AUTH\\||ACL for
  -.index \\DATA\\, ACL for
  +.index \\DATA\\, ACLs for
   .index \\ETRN\\||ACL for
   .index \\EXPN\\||ACL for
   .index \\HELO\\||ACL for
   .index \\EHLO\\||ACL for
   .index \\MAIL\\||ACL for
  +.index \\QUIT\\, ACL for
   .index \\RCPT\\||ACL for
   .index \\STARTTLS\\, ACL for
   .index \\VRFY\\||ACL for
  +.index SMTP||connection, ACL for
  +.index non-smtp message, ACL for
   .display
   .tabs 20
   .if !~~sys.fancy
  @@ -20945,14 +20738,19 @@
   \acl@_not@_smtp\      $t $rm{ACL for non-SMTP messages}
   \acl@_smtp@_auth\     $t $rm{ACL for \\AUTH\\}
   \acl@_smtp@_connect\  $t $rm{ACL for start of SMTP connection}
  -\acl@_smtp@_data\     $t $rm{ACL after \\DATA\\}
  +\acl@_smtp@_data\     $t $rm{ACL after \\DATA\\ is complete}
   \acl@_smtp@_etrn\     $t $rm{ACL for \\ETRN\\}
   \acl@_smtp@_expn\     $t $rm{ACL for \\EXPN\\}
   \acl@_smtp@_helo\     $t $rm{ACL for \\HELO\\ or \\EHLO\\}
   \acl@_smtp@_mail\     $t $rm{ACL for \\MAIL\\}
  -.newline
   \acl@_smtp@_mailauth\ $t $rm{ACL for the \\AUTH\\ parameter of \\MAIL\\}
   .newline
  +.em
  +\acl@_smtp@_mime\     $t $rm{ACL for content-scanning MIME parts}
  +\acl@_smtp@_predata\  $t $rm{ACL at start of \\DATA\\ command}
  +\acl@_smtp@_quit\     $t $rm{ACL for \\QUIT\\}
  +.nem
  +.newline
   \acl@_smtp@_rcpt\     $t $rm{ACL for \\RCPT\\}
   \acl@_smtp@_starttls\ $t $rm{ACL for \\STARTTLS\\}
   \acl@_smtp@_vrfy\     $t $rm{ACL for \\VRFY\\}
  @@ -20965,24 +20763,71 @@
   in an SMTP dialogue. The majority of policy tests on incoming messages can be
   done when \\RCPT\\ commands arrive. A rejection of \\RCPT\\ should cause the
   sending MTA to give up on the recipient address contained in the \\RCPT\\
  -command, whereas rejection at other times may cause the client MTA to keep on 
  -trying to deliver the message. It is therefore recommended that you do as much 
  +command, whereas rejection at other times may cause the client MTA to keep on
  +trying to deliver the message. It is therefore recommended that you do as much
   testing as possible at \\RCPT\\ time.


-However, you cannot test the contents of the message, for example, to verify
-addresses in the headers, at \\RCPT\\ time. Such tests have to appear in the
-ACL that is run after the message has been received, before the final response
-to the \\DATA\\ command is sent. This is the ACL specified by
-\acl@_smtp@_data\. At this time, it is no longer possible to reject individual
-recipients. An error response should reject the entire message. Unfortunately,
-it is known that some MTAs do not treat hard (5$it{xx}) errors correctly at
-this point -- they keep the message on their queues and try again later, but
-that is their problem, though it does waste some of your resources.
+.em
+.section The MIME ACLs
+The \acl@_smtp@_mime\ option is available only when Exim is compiled with the
+content-scanning extension. For details, see chapter ~~CHAPexiscan.
+
+
+.section The DATA ACLs
+.index \\DATA\\, ACLs for
+Two ACLs are associated with the \\DATA\\ command. When the command is
+received, the ACL defined by \acl@_smtp@_predata\ is obeyed. This gives you
+control after all the \\RCPT\\ commands, but before the message itself
+is received. It offers the opportunity to give a negative response to the
+\\DATA\\ command itself. Header lines added by \\MAIL\\ or \\RCPT\\ ACLs are
+not visible at this time, but any that are defined here are visible when the
+\acl@_smtp@_data\ ACL is run.

-The ACL test specified by \acl@_smtp@_connect\ happens after the test specified
+You cannot test the contents of the message, for example, to verify
+addresses in the headers, at \\RCPT\\ time or when the \\DATA\\ command is
+received.
+.nem
+Such tests have to appear in the ACL that is run after the message has been
+received, before the final response to the \\DATA\\ command is sent. This is
+the ACL specified by \acl@_smtp@_data\. At this time, it is no longer possible
+to reject individual recipients. An error response rejects the entire message.
+Unfortunately, it is known that some MTAs do not treat hard (5$it{xx}) errors
+correctly at this point -- they keep the message on their queues and try again
+later, but that is their problem, though it does waste some of your resources.
+
+.section The connect ACL
+.index SMTP||connection, ACL for
+The ACL test specified by \acl@_smtp@_connect\ happens after the test specified
by \host__reject__connection\ (which is now an anomaly) and any TCP Wrappers
testing (if configured).

+.em
+.section The QUIT ACL
+.rset SECTQUITACL "~~chapter.~~section"
+.index \\QUIT\\, ACL for
+The ACL for the SMTP \\QUIT\\ command is anomalous, in that the
+outcome of the ACL does not affect the response code to \\QUIT\\,
+which is always 221. Thus, the ACL does not in fact control any access.
+For this reason, the only verbs that are permitted are \accept\ and \warn\.
+
+This ACL can be used for tasks such as custom logging at the end of an SMTP
+session. For example, you can use ACL variables in other ACLs to count
+messages, recipients, etc., and log the totals at \\QUIT\\ time using one or
+more \logwrite\ modifiers on a \warn\ verb.
+
+You do not need to have a final \accept\, but if you do, you can use a
+\message\ modifier to specify custom text that is sent as part of the 221
+response to \\QUIT\\.
+
+This ACL is run only for a `normal' \\QUIT\\. For certain kinds of disastrous
+failure (for example, failure to open a log file, or when Exim is bombing out
+because it has detected an unrecoverable error), all SMTP commands from the
+client are given temporary error responses until \\QUIT\\ is received or the
+connection is closed. In these special cases, the \\QUIT\\ ACL does not run.
+.nem
+
+.section The non-SMTP ACL
+.index non-smtp message, ACL for
The non-SMTP ACL applies to all non-interactive incoming messages, that is, it
applies to batch SMTP as well as to non-SMTP messages. (Batch SMTP is not
really SMTP.) This ACL is run just before the \*local@_scan()*\ function. Any
@@ -20992,49 +20837,99 @@
encryption and authentication) are not relevant and are forbidden in this ACL.


+.section Finding an ACL to use
+.index ~~ACL||finding which to use
+The value of an \acl@_smtp@_$it{xxx}\ option is expanded before use, so you can
+use different ACLs in different circumstances. The resulting string does not
+have to be the name of an ACL in the configuration file; there are other
+possibilities. Having expanded the string, Exim searches for an ACL as follows:
+.numberpars $.
+If the string begins with a slash, Exim uses it as a file name, and reads its
+contents as an ACL. The lines are processed in the same way as lines in the
+Exim configuration file. In particular, continuation lines are supported, blank
+lines are ignored, as are lines whose first non-whitespace character is `@#'.
+If the file does not exist or cannot be read, an error occurs (typically
+causing a temporary failure of whatever caused the ACL to be run). For example:
+.display asis
+acl_smtp_data = /etc/acls/\
+ ${lookup{$sender_host_address}lsearch\
+ {/etc/acllist}{$value}{default}}
+.endd
+This looks up an ACL file to use on the basis of the host's IP address, falling
+back to a default if the lookup fails. If an ACL is successfully read from a
+file, it is retained in memory for the duration of the Exim process, so that it
+can be re-used without having to re-read the file.
+.nextp
+If the string does not start with a slash, and does not contain any spaces,
+Exim searches the ACL section of the configuration for an ACL whose name
+matches the string.
+.nextp
+If no named ACL is found, or if the string contains spaces, Exim parses
+the string as an inline ACL. This can save typing in cases where you just
+want to have something like
+.display asis
+acl_smtp_vrfy = accept
+.endd
+in order to allow free use of the \\VRFY\\ command. Such a string may contain
+newlines; it is processed in the same way as an ACL that is read from a file.
+.endp
+
+
.section ACL return codes
.index ~~ACL||return codes
-The result of running an ACL is either `accept' or `deny', or, if some test
+.em
+Except for the \\QUIT\\ ACL, which does not affect the SMTP return code (see
+section ~~SECTQUITACL above), the
+.nem
+result of running an ACL is either `accept' or `deny', or, if some test
cannot be completed (for example, if a database is down), `defer'. These
results cause 2$it{xx}, 5$it{xx}, and 4$it{xx} return codes, respectively, to
be used in the SMTP dialogue. A fourth return, `error', occurs when there is an
error such as invalid syntax in the ACL. This also causes a 4$it{xx} return
code.

-The ACLs that are relevant to message reception may also return `discard'. This
+.em
+For the non-SMTP ACL, `defer' and `error' are treated in the same way as
+`deny', because there is no mechanism for passing temporary errors to the
+submitters of non-SMTP messages.
+.nem
+
+ACLs that are relevant to message reception may also return `discard'. This
has the effect of `accept', but causes either the entire message or an
individual recipient address to be discarded. In other words, it is a
-blackholing facility. Use it with great care.
+blackholing facility. Use it with care.

If the ACL for \\MAIL\\ returns `discard', all recipients are discarded, and no
ACL is run for subsequent \\RCPT\\ commands. The effect of `discard' in a
-\\RCPT\\ ACL is to discard just the one address. If there are no recipients
-left when the message's data is received, the \\DATA\\ ACL is not run. A
-`discard' return from the \\DATA\\ or the non-SMTP ACL discards all the
+\\RCPT\\ ACL is to discard just the one recipient address. If there are no
+recipients left when the message's data is received, the \\DATA\\ ACL is not
+run. A `discard' return from the \\DATA\\ or the non-SMTP ACL discards all the
remaining recipients.
+.em
+The `discard' return is not permitted for the \acl@_smtp@_predata\ ACL.
+.nem

-The \*local@_scan()*\ function is always run, even if there are no remaining
+.index \*local@_scan()*\ function||when all recipients discarded
+The \*local@_scan()*\ function is always run, even if there are no remaining
recipients; it may create new recipients.


.section Unset ACL options
.index ~~ACL||unset options
-.em
The default actions when any of the \acl@_$it{xxx}\ options are unset are not
all the same. \**Note**\: These defaults apply only when the relevant ACL is
-not defined at all. For any defined ACL, the default action if control reaches
+not defined at all. For any defined ACL, the default action when control reaches
the end of the ACL statements is `deny'.
-.nem

For \acl@_not@_smtp\, \acl@_smtp@_auth\, \acl@_smtp@_connect\,
\acl@_smtp@_data\, \acl@_smtp@_helo\, \acl__smtp__mail\, \acl@_smtp@_mailauth\,
-and \acl@_smtp@_starttls\, the
.em
-action when the ACL is not defined is `accept'.
+\acl@_smtp@_predata\, \acl@_smtp@_quit\,
+.nem
+and \acl@_smtp@_starttls\, the action when the ACL is not defined is `accept'.

For the others (\acl@_smtp@_etrn\, \acl@_smtp@_expn\, \acl@_smtp@_rcpt\, and
\acl@_smtp@_vrfy\), the action when the ACL is not defined is `deny'.
-.nem
This means that \acl@_smtp@_rcpt\ must be defined in order to receive any
messages over an SMTP connection. For an example, see the ACL in the default
configuration file.
@@ -21049,15 +20944,18 @@
ACL statements. In the case of \\RCPT\\ (but not \\MAIL\\ or \\DATA\\),
\$domain$\ and \$local@_part$\ are set from the argument address.

-When an ACL for the \\AUTH\\ parameter of \\MAIL\\ is being run, the variables
-that contain information about the host are set, but \$sender@_address$\ is not
+When an ACL for the \\AUTH\\ parameter of \\MAIL\\ is being run, the variables
+that contain information about the host are set, but \$sender@_address$\ is not
yet set.
+.em
+Section ~~SECTauthparamail contains a discussion of this parameter and
+how it is used.
+.nem

The \$message@_size$\ variable is set to the value of the \\SIZE\\ parameter on
the \\MAIL\\ command at \\MAIL\\ and \\RCPT\\ time, or -1 if that parameter was
-not given.
-Its value is updated to the true message size by the time the ACL after
-\\DATA\\ is run.
+not given. Its value is updated to the true message size by the time the ACL
+after \\DATA\\ is run.

   The \$rcpt@_count$\ variable increases by one for each \\RCPT\\ command
   received. The \$recipients@_count$\ variable increases by one each time a
  @@ -21071,9 +20969,10 @@
   .section Data for non-message ACLs
   .rset SECTdatfornon "~~chapter.~~section"
   .index ~~ACL||data for non-message ACL
  -When an ACL for \\AUTH\\, \\ETRN\\, \\EXPN\\, 
  -\\STARTTLS\\,
  -or \\VRFY\\ is being run, the remainder of the SMTP command line is placed in
  +.em
  +When an ACL is being run for \\AUTH\\, \\EHLO\\, \\ETRN\\, \\EXPN\\, \\HELO\\,
  +.nem
  +\\STARTTLS\\, or \\VRFY\\, the remainder of the SMTP command line is placed in
   \$smtp@_command@_argument$\. This can be tested using a \condition\ condition.
   For example, here is an ACL for use with \\AUTH\\, which insists that either
   the session is encrypted, or the CRAM-MD5 authentication method is used. In
  @@ -21082,82 +20981,54 @@
   .display asis
   acl_check_auth:
     accept encrypted = *
  +.newline
  +.em
     accept condition = ${if eq{${uc:$smtp_command_argument}}\
  -                      {CRAM-MD5}{yes}{no}}
  +                     {CRAM-MD5}}
  +.nem
  +.newline
     deny   message   = TLS encryption or CRAM-MD5 required
   .endd
  -(Another way of applying this restriction is to arrange for the authenticators 
  -that use cleartext passwords not to be advertised when the connection is not 
  -encrypted. You can use the generic \server@_advertise@_condition\ authenticator 
  +(Another way of applying this restriction is to arrange for the authenticators
  +that use cleartext passwords not to be advertised when the connection is not
  +encrypted. You can use the generic \server@_advertise@_condition\ authenticator
   option to do this.)



  -.section Use of the ACL selection options
  -.index ~~ACL||specifying which to use
  -The value of an \acl@_smtp@_$it{xxx}\ option is expanded before use, so you can
  -use different ACLs in different circumstances, and in fact the resulting string
  -does not have to be the name of a configured list. Having expanded the string,
  -Exim searches for an ACL as follows:
  -.numberpars $.
  -If the string begins with a slash, Exim attempts to open the file and read
  -its contents as an ACL. 
  -The lines are processed in the same way as lines in the Exim configuration
  -file. In particular, continuation lines are supported, blank lines are ignored,
  -as are lines whose first non-whitespace character is `@#'.
  -If the file does not exist or cannot be read, an error occurs (typically
  -causing a temporary failure of whatever caused the ACL to be run). For example:
  -.display asis
  -acl_smtp_data = /etc/acls/\
  -  ${lookup{$sender_host_address}lsearch\
  -  {/etc/acllist}{$value}{default}}
  -.endd
  -This looks up an ACL file to use on the basis of the host's IP address, falling
  -back to a default if the lookup fails. If an ACL is successfully read from a
  -file, it is retained in memory for the duration of the Exim process, so that it
  -can be re-used without having to re-read the file.
  -.nextp
  -If the string does not start with a slash, and does not contain any spaces,
  -Exim searches the ACL section of the configuration for a list whose name
  -matches the string.
  -.nextp
  -If no named ACL is found, or if the string contains spaces, Exim parses
  -the string as an inline ACL. This can save typing in cases where you just
  -want to have something like
  -.display asis
  -acl_smtp_vrfy = accept
  -.endd
  -in order to allow free use of the \\VRFY\\ command.
  -Such a string may contain newlines; it is processed in the same way as an ACL 
  -that is read from a file.
  -.endp
  -
  -
   .section Format of an ACL
   .index ~~ACL||format of
   .index ~~ACL||verbs, definition of
   An individual ACL consists of a number of statements. Each statement starts
  -with a verb, optionally followed by a number of conditions and other modifiers.
  -If all the conditions are met, the verb is obeyed. 
  -The same condition may be used (with different arguments) more than once in the 
  -same statement. This provides a means of specifying an `and' conjunction 
  -between conditions. For example:
  +with a verb, optionally followed by a number of conditions and `modifiers'.
  +.em
  +Modifiers can change the way the verb operates, define error and log messages,
  +set variables, insert delays, and vary the processing of accepted messages.
  +.nem
  +
  +If all the conditions are met, the verb is obeyed. The same condition may be
  +used (with different arguments) more than once in the same statement. This
  +provides a means of specifying an `and' conjunction between conditions. For
  +example:
   .display asis
   deny  dnslists = list1.example
         dnslists = list2.example
   .endd
  +If there are no conditions, the verb is always obeyed.
  +.em
  +Exim stops evaluating the conditions and modifiers when it reaches a condition
  +that fails. What happens then
  +.nem
  +depends on the verb (and in one case, on a special modifier). Not all the
  +conditions make sense at every testing point. For example, you cannot test a
  +sender address in the ACL that is run for a \\VRFY\\ command.


-If there are no conditions, the verb is always obeyed. What happens if any of
-the conditions are not met depends on the verb (and in one case, on a special
-modifier). Not all the conditions make sense at every testing point. For
-example, you cannot test a sender address in the ACL that is run for a \\VRFY\\
-command.
-
-The verbs are as follows:
+.section ACL verbs
+The ACL verbs are as follows:
.numberpars $.
\accept\: If all the conditions are met, the ACL returns `accept'. If any of
the conditions are not met, what happens depends on whether \endpass\ appears
-among the conditions (for syntax see below). If the failing condition precedes
-\endpass\, control is passed to the next ACL statement; if it follows
+among the conditions (for syntax see below). If the failing condition is before
+\endpass\, control is passed to the next ACL statement; if it is after
\endpass\, the ACL returns `deny'. Consider this statement, used to check a
\\RCPT\\ command:
.display asis
@@ -21170,8 +21041,8 @@
command is accepted if verification succeeds. However, if verification fails,
the ACL yields `deny', because the failing condition is after \endpass\.
.nextp
-\defer\: If all the conditions are met, the ACL returns `defer' which, in an
-SMTP session, causes a 4\*xx*\ response to be given. For a non-SMTP ACL,
+\defer\: If all the conditions are met, the ACL returns `defer' which, in an
+SMTP session, causes a 4\*xx*\ response to be given. For a non-SMTP ACL,
\defer\ is the same as \deny\, because there is no way of sending a temporary
error. For a \\RCPT\\ command, \defer\ is much the same as using a
\%redirect%\ router and \":defer:"\ while verifying, but the \defer\ verb can
@@ -21185,11 +21056,11 @@
.endd
rejects commands from hosts that are on a DNS black list.
.nextp
-\discard\: This verb behaves like \accept\, except that it returns `discard'
+\discard\: This verb behaves like \accept\, except that it returns `discard'
from the ACL instead of `accept'. It is permitted only on ACLs that are
concerned with receiving messages, and it causes recipients to be discarded.
-If the \log@_message\ modifier is set when \discard\ operates, its contents are
-added to the line that is automatically written to the log.
+If the \log@_message\ modifier is set when \discard\ operates, its contents are
+added to the line that is automatically written to the log.

   If \discard\ is used in an ACL for \\RCPT\\, just the one recipient is
   discarded; if used for \\MAIL\\, \\DATA\\ or in the non-SMTP ACL, all the
  @@ -21201,7 +21072,10 @@
   forcibly closed after the 5\*xx*\ error message has been sent. For example:
   .display asis
   drop   message   = I don't take more than 20 RCPTs
  -       condition = ${if > {$rcpt_count}{20}{yes}{no}}
  +.newline
  +.em
  +       condition = ${if > {$rcpt_count}{20}}
  +.nem
   .endd
   There is no difference between \deny\ and \drop\ for the connect-time ACL. The
   connection is always dropped after sending a 550 response.
  @@ -21215,54 +21089,30 @@
   passes control to subsequent statements only if the message's sender can be
   verified. Otherwise, it rejects the command.
   .nextp
  -.em
   \warn\: If all the conditions are met, a header line is added to an incoming
   message and/or a line is written to Exim's main log. In all cases, control
   passes to the next ACL statement. The text of the added header line and the log
   line are specified by modifiers; if they are not present, a \warn\ verb just
   checks its conditions and obeys any `immediate' modifiers such as \set\ and
   \logwrite\.
  +.em
  +There is more about adding header lines in section ~~SECTaddheadwarn.
  +.nem


If any condition on a \warn\ statement cannot be completed (that is, there is
-some sort of defer), no header is added and the configured log line is not
-written. No further conditions or modifiers in the \warn\ statement are
+some sort of defer), no header lines are added and the configured log line is
+not written. No further conditions or modifiers in the \warn\ statement are
processed. The incident is logged, but the ACL continues to be processed, from
the next statement onwards.

  -When testing an incoming message, the \message\ modifier can be used on a 
  -\warn\ statement to add an extra header line,
  -.nem
  -as in this example:
  -.display asis
  -warn message = X-blacklisted-at: $dnslist_domain
  -     dnslists = blackholes.mail-abuse.org : \
  -                dialup.mail-abuse.org
  -.endd
  -If an identical header line is requested several times (provoked, for example,
  -by multiple \\RCPT\\ commands), only one copy is actually added to the message.
  -.em
  -If the text of the \message\ modifier is not a valid header line, 
  -\"X-ACL-Warn:"\ is added to the front of it.
  -.nem
  -
  -Header lines that are added by an ACL at \\MAIL\\ or \\RCPT\\ time are not
  -visible in string expansions in the ACL for subsequent \\RCPT\\ commands.
  -However they are visible in string expansions in the ACL that is run after
  -\\DATA\\. If you want to preserve data between \\MAIL\\ and \\RCPT\\ ACLs, you
  -can use ACL variables, as described in the next section. If a message is
  -rejected after \\DATA\\, all added header lines are included in the entry that
  -is written to the reject log.
  -
  -If a \message\ modifier is present on a \warn\ verb in an ACL that is not 
  +If a \message\ modifier is present on a \warn\ verb in an ACL that is not
   testing an incoming message, it is ignored, and the incident is logged.


-A \warn\ statement may use the \log@_message\ modifier to cause a line to be
-written to the main log when the statement's conditions are true.
-.em
-Just as for \message\, if an identical log line is requested several times in
-the same message, only one copy is actually written to the log. If you want to
-force duplicates to be written, use the \logwrite\ modifier instead.
-.nem
+A \warn\ statement may use the \log@_message\ modifier to cause a line to be
+written to the main log when the statement's conditions are true.
+If an identical log line is requested several times in the same message, only
+one copy is actually written to the log. If you want to force duplicates to be
+written, use the \logwrite\ modifier instead.

When one of the \warn\ conditions is an address verification that fails, the
text of the verification failure message is in \$acl@_verify@_message$\. If you
@@ -21278,39 +21128,37 @@
As you can see from the examples above, the conditions and modifiers are
written one to a line, with the first one on the same line as the verb, and
subsequent ones on following lines. If you have a very long condition, you can
-continue it onto several physical lines by the usual @\ continuation mechanism.
-It is conventional to align the conditions vertically.
+continue it onto several physical lines by the usual backslash continuation
+mechanism. It is conventional to align the conditions vertically.


   .section ACL variables
   .rset SECTaclvariables "~~chapter.~~section"
   .index ~~ACL||variables
   There are some special variables that can be set during ACL processing. They
  -can be used to pass information between different ACLs, different
  -invocations of the same ACL in the same SMTP connection, and between ACLs and
  -the routers, transports, and filters that are used to deliver a message.
  -There are two sets of these variables:
  +can be used to pass information between different ACLs, different invocations
  +of the same ACL in the same SMTP connection, and between ACLs and the routers,
  +transports, and filters that are used to deliver a message. There are two sets
  +of these variables:
   .numberpars $.
   The values of \$acl@_c0$\ to \$acl@_c9$\ persist throughout an SMTP connection.
  -They are never reset. Thus, a value that is set while receiving one message is 
  +They are never reset. Thus, a value that is set while receiving one message is
   still available when receiving the next message on the same SMTP connection.
   .nextp
   The values of \$acl@_m0$\ to \$acl@_m9$\ persist only while a message is being
   received. They are reset afterwards. They are also reset by \\MAIL\\, \\RSET\\,
   \\EHLO\\, \\HELO\\, and after starting up a TLS session.
   .endp
  -When a message is accepted, the current values of all the ACL variables are 
  +When a message is accepted, the current values of all the ACL variables are
   preserved with the message and are subsequently made available at delivery
  -time.
  -
  -The ACL variables are set by modifier called \set\. For example:
  +time. The ACL variables are set by modifier called \set\. For example:
   .display asis
   accept hosts = whatever
          set acl_m4 = some value
   .endd
  -Note that the leading dollar sign is not used when naming a variable that is to
  +\**Note**\: a leading dollar sign is not used when naming a variable that is to
   be set. If you want to set a variable without taking any action, you can use a
  -\warn\ verb without any other modifiers.
  +\warn\ verb without any other modifiers or conditions.



   .section Condition and modifier processing
  @@ -21322,7 +21170,7 @@
         !verify = recipient
   .endd
   causes the ACL to return `deny' if the recipient domain ends in
  -\*dom.example*\, but the recipient address cannot be verified.
  +\*dom.example*\ and the recipient address cannot be verified.


The arguments of conditions and modifiers are expanded. A forced failure
of an expansion causes a condition to be ignored, that is, it behaves as if the
@@ -21345,12 +21193,14 @@
specify actions that are taken as the conditions for a statement are checked;
others specify text for messages that are used when access is denied or a
warning is generated.
+.em
+The \control\ modifier affects the way an incoming message is handled.
+.nem

   The positioning of the modifiers in an ACL statement important, because the
   processing of a verb ceases as soon as its outcome is known. Only those
  -modifiers that have already been encountered will take effect. For the \accept\
  -and \require\ statements, this means that processing stops as soon as a false
  -condition is met. For example, consider this use of the \message\ modifier:
  +modifiers that have already been encountered will take effect. For example,
  +consider this use of the \message\ modifier:
   .display asis
   require message = Can't verify sender
           verify = sender
  @@ -21358,23 +21208,23 @@
           verify = recipient
           message = This message cannot be used
   .endd
  -If sender verification fails, Exim knows that the result of the statement is 
  -`deny', so it goes no further. The first \message\ modifier has been seen, so 
  +If sender verification fails, Exim knows that the result of the statement is
  +`deny', so it goes no further. The first \message\ modifier has been seen, so
   its text is used as the error message. If sender verification succeeds, but
   recipient verification fails, the second message is used. If recipient
   verification succeeds, the third message becomes `current', but is never used
   because there are no more conditions to cause failure.


   For the \deny\ verb, on the other hand, it is always the last \message\
  -modifier that is used, because all the conditions must be true for rejection to 
  -happen. Specifying more than one \message\ modifier does not make sense, and 
  +modifier that is used, because all the conditions must be true for rejection to
  +happen. Specifying more than one \message\ modifier does not make sense, and
   the message can even be specified after all the conditions. For example:
   .display asis
   deny   hosts = ...
         !senders = *@my.domain.example
          message = Invalid sender from client host
   .endd
  -The `deny' result does not happen until the end of the statement is reached, by 
  +The `deny' result does not happen until the end of the statement is reached, by
   which time Exim has set up the message.



@@ -21386,18 +21236,10 @@
.startitems

.item "control = <<text>>"
-.index message||submission
-This modifier may appear only in ACLs for commands relating to incoming
-messages. It affects the subsequent processing of the message, provided that
-the message is eventually accepted.
.em
-The text must be one of the words `freeze', `queue@_only', or `submission' (in
-the latter case, optionally followed by slash-delimited options). The first two
-cause the message to be frozen or just queued (without immediate delivery),
-respectively. The third tells Exim that this message is a submission from a
-local MUA. In this case, Exim applies certain fixups to the message if
-necessary. For example, it add a ::Date:: header line if one is not present.
-Details are given in chapter ~~CHAPmsgproc.
+This modifier affects the subsequent processing of the SMTP connection or of an
+incoming message that is accepted. As there are now quite a few controls that
+can be applied, they are described separately in section ~~SECTcontrols below.
.nem

   Once one of these controls is set, it remains set for the message. For example,
  @@ -21407,10 +21249,11 @@
   .numberpars $.
   It can be at the end of an \accept\ statement:
   .display asis
  -accept  ...some conditions...
  +accept  ...some conditions
           control = queue_only
   .endd
  -In this case, the control is applied when this statement yields `accept'.
  +In this case, the control is applied when this statement yields `accept', in
  +other words, when the conditions are all true.
   .nextp
   It can be in the middle of an \accept\ statement:
   .display asis
  @@ -21418,7 +21261,7 @@
           control = queue_only
           ...some more conditions...
   .endd
  -If the first set of conditions are true, the control is applied, even if the 
  +If the first set of conditions are true, the control is applied, even if the
   statement does not accept because one of the second set of conditions is false.
   In this case, some subsequent statement must yield `accept' for the control to
   be relevant.
  @@ -21431,22 +21274,18 @@
           control = freeze
   accept  ...
   .endd
  -.em
   This example of \warn\ does not contain \message\, \log@_message\, or
   \logwrite\, so it does not add anything to the message and does not write a log
   entry.
  -.nem
   .endp


.item "delay = <<time>>"
.index \-bh-\ option
This modifier causes Exim to wait for the time interval before proceeding. The
time is given in the usual Exim notation. This modifier may appear in any ACL.
-The delay happens as soon as the modifier is processed.
-.em
-However, when testing Exim using the \-bh-\ option, the delay is not actually
-imposed (an appropriate message is output).
-.nem
+The delay happens as soon as the modifier is processed. However, when testing
+Exim using the \-bh-\ option, the delay is not actually imposed (an appropriate
+message is output instead).

   Like \control\, \delay\ can be used with \accept\ or
   \deny\, for example:
  @@ -21454,7 +21293,7 @@
   deny    ...some conditions...
           delay = 30s
   .endd
  -The delay happens if all the conditions are true, before the statement returns 
  +The delay happens if all the conditions are true, before the statement returns
   `deny'. Compare this with:
   .display asis
   deny    delay = 30s
  @@ -21477,11 +21316,7 @@


   .item "log@_message = <<text>>"
   This modifier sets up a message that is used as part of the log message if the
  -ACL denies access
  -.em
  -or a \warn\ statement's conditions are true. 
  -.nem
  -For example:
  +ACL denies access or a \warn\ statement's conditions are true. For example:
   .display asis
   require log_message = wrong cipher suite $tls_cipher
           encrypted   = DES-CBC3-SHA
  @@ -21493,21 +21328,19 @@
   does not happen until Exim decides that access is to be denied. This means that
   any variables that are set by the condition are available for inclusion in the
   message. For example, the \$dnslist@_<<xxx>>$\ variables are set after a DNS
  -black list lookup succeeds. If the expansion of \log@_message\ fails, or if the 
  +black list lookup succeeds. If the expansion of \log@_message\ fails, or if the
   result is an empty string, the modifier is ignored.


If you want to use a \warn\ statement to log the result of an address
verification, you can use \$acl__verify__message$\ to include the verification
error message.

-.em
If \log@_message\ is used with a \warn\ statement, `Warning:' is added to the
start of the logged message. If the same warning log message is requested more
than once while receiving a single email message, only one copy is actually
logged. If you want to log multiple copies, use \logwrite\ instead of
\log@_message\. In the absence of \log@_message\ and \logwrite\, nothing is
logged for a succesful \warn\ statement.
-.nem

   If \log@_message\ is not present and there is no underlying error message (for
   example, from the failure of address verification), but \message\ is present,
  @@ -21519,13 +21352,10 @@
   .item "logwrite = <<text>>"
   .index log||in ACL, immediate
   This modifier writes a message to a log file as soon as it is encountered when
  -processing an ACL. (Compare \log@_message\, which,
  -.em
  -except in the case of \warn\,
  -.nem
  -is used only if the ACL statement denies access.) The \logwrite\ modifier can
  -be used to log special incidents in ACLs. For example:
  -.display 
  +processing an ACL. (Compare \log@_message\, which, except in the case of
  +\warn\, is used only if the ACL statement denies access.) The \logwrite\
  +modifier can be used to log special incidents in ACLs. For example:
  +.display
   accept <<some special conditions>>
          control  = freeze
          logwrite = froze message because ...
  @@ -21541,25 +21371,25 @@


.item "message = <<text>>"
This modifier sets up a text string that is expanded and used as an error
-message if the current statement causes the ACL to deny access. The expansion
-happens at the time Exim decides that access is to be denied, not at the time
+message if the current statement causes the ACL to deny access. The expansion
+happens at the time Exim decides that access is to be denied, not at the time
it processes \message\. If the expansion fails, or generates an empty string,
the modifier is ignored. For ACLs that are triggered by SMTP commands, the
message is returned as part of the SMTP error response.

The \message\ modifier is also used with the \warn\ verb to specify one or more
-header lines to be added to an incoming message when all the conditions are
-true.
-If \message\ is used with \warn\ in an ACL that is not concerned with receiving
-a message, it has no effect.
+header lines to be added to an incoming message when all the conditions are
+true. See section ~~SECTaddheadwarn for more details. If \message\ is used with
+\warn\ in an ACL that is not concerned with receiving a message, it has no
+effect.

The text is literal; any quotes are taken as literals, but because the string
is expanded, backslash escapes are processed anyway. If the message contains
newlines, this gives rise to a multi-line SMTP response. Like \log@_message\,
the contents of \message\ are not expanded until after a condition has failed.

-If \message\ is used on a statement that verifies an address, the message
-specified overrides any message that is generated by the verification process.
+If \message\ is used on a statement that verifies an address, the message
+specified overrides any message that is generated by the verification process.
However, the original message is available in the variable
\$acl@_verify@_message$\, so you can incorporate it into your message if you
wish. In particular, if you want the text from \:fail:\ items in \%redirect%\
@@ -21567,25 +21397,220 @@
use a \message\ modifier, or make use of \$acl@_verify@_message$\.

.item "set <<acl@_name>> = <<value>>"
-This modifier puts a value into one of the ACL variables (see section
+This modifier puts a value into one of the ACL variables (see section
~~SECTaclvariables).

.enditems


  +.em
  +.section Use of the control modifier
  +.rset SECTcontrols "~~chapter.~~section"
  +.index \control\ modifier
  +The \control\ modifier supports the following settings:
  +
  +.startitems
  +
  +.item "control = caseful@_local@_part"
  +.item "control = caselower@_local@_part"
  +.index ~~ACL||case of local part in
  +.index case of local parts
  +These two controls are permitted only in the ACL specified by \acl@_smtp@_rcpt\
  +(that is, during \\RCPT\\ processing). By default, the contents of
  +\$local@_part$\ are lower cased before ACL processing. If
  +`caseful@_local@_part' is specified, any uppercase letters in the original
  +local part are restored in \$local@_part$\ for the rest of the ACL, or until a
  +control that sets `caselower@_local@_part' is encountered. However, this
  +applies only to local part handling that takes place directly in the ACL (for
  +example, as a key in lookups). If a test to verify the recipient is obeyed, the
  +case-related handling of the local part during the verification is controlled
  +by the router configuration (see the \caseful@_local@_part\ generic router
  +option).
  +
  +This facility could be used, for example, to add a spam score to local parts
  +containing upper case letters. For example, using \$acl@_m4$\ to accumulate the
  +spam score:
  +.display asis
  +warn  control = caseful_local_part
  +      set acl_m4 = ${eval:\
  +                     $acl_m4 + \
  +                     ${if match{$local_part}{[A-Z]}{1}{0}}\
  +                    }
  +      control = caselower_local_part
  +.endd
  +Notice that we put back the lower cased version afterwards, assuming that
  +is what is wanted for subsequent tests.
  +
  +.item "control = enforce@_sync"
  +.item "control = no@_enforce@_sync"
  +.index SMTP||synchronization checking
  +.index synchronization checking in SMTP
  +These controls make it possible to be selective about when SMTP synchronization
  +is enforced. The global option \smtp@_enforce@_sync\ specifies the initial
  +state of the switch (it is true by default). See the description of this option
  +in chapter ~~CHAPmainconfig for details of SMTP synchronization checking.
  +
  +These two controls can appear in any ACL except the one for the non-SMTP
  +messages. The most straightforward place to put them is in the ACL defined by
  +\acl@_smtp@_connect\, which is run at the start of an incoming SMTP connection,
  +before the first synchronization check. The expected use is to turn off the
  +synchronization checks for badly-behaved hosts that you nevertheless need to
  +work with.
  +
  +.item "control = fakereject/<<message>>"
  +.index fake rejection
  +.index rejection, fake
  +This control is permitted only for the \\MAIL\\, \\RCPT\\, and \\DATA\\ ACLs,
  +in other words, only when an SMTP message is being received. If Exim accepts
  +the message, instead the final 250 response, a 550 rejection message is sent.
  +However, Exim proceeds to deliver the message as normal.
  +
  +The text for the 550 response is taken from the \control\ modifier. If no
  +message is supplied, the following is used:
  +.display asis
  +550-Your message has been rejected but is being 
  +550-kept for evaluation.
  +550-If it was a legit message, it may still be 
  +550 delivered to the target recipient(s).
  +.endd
  +This facilty should be used with extreme caution.
  +
  +
  +.item "control = freeze"
  +.index frozen messages||forcing in ACL
  +This control is permitted only for the \\MAIL\\, \\RCPT\\, \\DATA\\, and
  +non-SMTP ACLs, in other words, only when a message is being received. If the
  +message is accepted, it is placed on Exim's queue and frozen.
  +
  +
  +.item "control = no@_multiline@_response"
  +.index multiline responses, suppressing
  +This control is permitted for any ACL except the one for non-SMTP messages.
  +It seems that there are broken clients in use that cannot handle multiline
  +SMTP responses, despite the fact that RFC 821 defined them over 20 years ago.
  +
  +If this control is set, multiline SMTP responses from ACL rejections are
  +suppressed. One way of doing this would have been to put out these responses as
  +one long line. However, RFC 2821 specifies a maximum of 512 bytes per response
  +(`use multiline responses for more' it says -- ha!), and some of the responses
  +might get close to that. So this facility, which is after all only a sop to
  +broken clients, is implemented by doing two very easy things:
  +.numberpars
  +Extra information that is normally output as part of a rejection
  +caused by sender verification failure is omitted. Only the final line
  +(typically `sender verification failed') is sent.
  +.nextp
  +If a \message\ modifier supplies a multiline response, only the first
  +line is output.
  +.endp
  +The setting of the switch can, of course, be made conditional on the
  +calling host.
  +
  +
  +.item "control = queue@_only"
  +.index \queue@_only\
  +.index queueing incoming messages
  +This control is permitted only for the \\MAIL\\, \\RCPT\\, \\DATA\\, and
  +non-SMTP ACLs, in other words, only when a message is being received. If the
  +message is accepted, it is placed on Exim's queue and left there for delivery
  +by a subsequent queue runner. No immediate delivery process is started. In
  +other words, it has the effect of the \queue@_only\ global option for just the
  +one message.
  +
  +
  +.item "control = submission/<<options>>"
  +.index message||submission
  +.index submission mode
  +This control is permitted only for the \\MAIL\\, \\RCPT\\, and start of data
  +ACLs (the latter is the one defined by \acl@_smtp@_predata\). Setting it tells
  +Exim that the message is a submission from a local MUA. In this case, Exim
  +operates in `submission mode', and applies certain fixups to the message if
  +necessary. For example, it add a ::Date:: header line if one is not present.
  +This control is not permitted in the \\DATA\\ ACL, because that is too late
  +(the message has already been created).
  +
  +Chapter ~~CHAPmsgproc describes the processing that Exim applies to messages.
  +Section ~~SECTsubmodnon covers the processing that happens in submission mode;
  +the available options for this control are described there.
  +
  +.enditems
  +.nem
  +
  +
  +.em
  +.section Adding header lines with the warn verb
  +.rset SECTaddheadwarn "~~chapter.~~section"
  +.index header lines||adding in an ACL
  +.index header lines||position of added lines
  +The \message\ modifier can be used on a \warn\ statement to add an extra header
  +line to an incoming message, as in this example:
  +.display asis
  +warn message = X-blacklisted-at: $dnslist_domain
  +     dnslists = sbl.spamhaus.org : \
  +                dialup.mail-abuse.org
  +.endd
  +If an identical header line is requested several times (provoked, for example,
  +by multiple \\RCPT\\ commands), only one copy is actually added to the message.
  +If the text of the \message\ modifier contains one or more newlines that are
  +not followed by a space or a tab, it is assumed to contain multiple header
  +lines. Each one is checked for valid syntax; \"X-ACL-Warn:"\ is added to the
  +front of any line that is not a valid header line.
  +
  +By default, new lines are added at the end of the existing header lines.
  +However, you can specify that any particular header line should be added right
  +at the start (before all the ::Received:: lines), immediately after the first
  +block of ::Received:: lines, or immediately before any line that is not a
  +::Received:: or ::Resent-something:: header.
  +
  +This is done by specifying `:at@_start:', `:after@_received:', or
  +`:at@_start@_rfc:' (or, for completeness, `:at@_end:') before the text of the
  +header line, respectively. (Header text cannot start with a colon, as there has
  +to be a header name first.) For example:
  +.display asis
  +warn message = :after_received:X-My-Header: something or other...
  +.endd
  +
  +If more than one header is supplied in a single warn statement, each one is
  +treated independently and can therefore be placed differently. If you add
  +more than one line at the start, or after the Received: block, they will
  +end up in reverse order.
  +
  +\**Warning**\: This facility currently applies only to header lines that are
  +added in an ACL. It does NOT work for header lines that are added in a
  +system filter or in a router or transport.
  +
  +.index header lines||added, visibility of
  +Header lines that are added by an ACL at \\MAIL\\ or \\RCPT\\ time are not
  +visible in string expansions in ACLs for subsequent \\RCPT\\ commands or in the
  +\acl@_smtp@_predata\ ACL. However, they are visible in string expansions in the
  +ACL that is run after \\DATA\\ is complete (the \acl@_smtp@_data\ ACL). This is
  +also true for header lines that are added in the \acl@_smtp@_predata\ ACL.
  +If a message is rejected after \\DATA\\, all added header lines are included in
  +the entry that is written to the reject log.
  +
  +If you want to preserve data between \\MAIL\\, \\RCPT\\, and the
  +\acl@_smtp@_predata\ ACLs, you can use ACL variables, as described in section
  +~~SECTaclvariables.
  +.nem
  +



.section ACL conditions
.rset SECTaclconditions "~~chapter.~~section"
.index ~~ACL||conditions, list of
+.em
+Some of conditions listed in this section are available only when Exim is
+compiled with the content-scanning extension. They are included here briefly
+for completeness. More detailed descriptions can be found in the discussion on
+content scanning in chapter ~~CHAPexiscan.
+.nem
+
Not all conditions are relevant in all circumstances. For example, testing
senders and recipients does not make sense in an ACL that is being run as the
result of the arrival of an \\ETRN\\ command, and checks on message headers can
-be done only in the ACLs specified by \acl@_smtp@_data\
-and \acl__not__smtp\.
-You can use the same condition (obviously with different parameters) more than
-once in the same ACL statement. This provides a way of specifying an `and'
-conjunction.
+be done only in the ACLs specified by \acl@_smtp@_data\ and \acl__not__smtp\.
+You can use the same condition (with different parameters) more than once in
+the same ACL statement. This provides a way of specifying an `and' conjunction.
The conditions are as follows:

.startitems
@@ -21595,14 +21620,21 @@
.index ~~ACL||indirect
The possible values of the argument are the same as for the
\acl@_smtp@_$it{xxx}\ options. The named or inline ACL is run. If it returns
-`accept' the condition is true; if it returns `deny' the condition is false; if
-it returns `defer', the current ACL returns `defer'.
-If it returns `drop' and the outer condition denies access, the connection is
-dropped. If it returns `discard', the verb must be \accept\ or \discard\, and
-the action is taken immediately -- no further conditions are tested.
+`accept' the condition is true; if it returns `deny' the condition is false. If
+it returns `defer', the current ACL returns `defer'
+.em
+unless the condition is on a \warn\ verb. In that case, a `defer' return makes
+the condition false. This means that further processing of the \warn\ verb
+ceases, but processing of the ACL continues.
+.nem
+
+If the nested \acl\ returns `drop' and the outer condition denies access,
+the connection is dropped. If it returns `discard', the verb must be \accept\
+or \discard\, and the action is taken immediately -- no further conditions are
+tested.

ACLs may be nested up to 20 deep; the limit exists purely to catch runaway
-loops. This condition allows you to use different ACLs in different
+loops. This condition allows you to use different ACLs in different
circumstances. For example, different ACLs can be used to handle \\RCPT\\
commands for different local users or different local domains.

@@ -21625,14 +21657,24 @@
or one of the strings `yes' or `true', the condition is true. For any other
values, some error is assumed to have occured, and the ACL returns `defer'.

+
+.em
+.item "decode = <<location>>"
+This condition is available only when Exim is compiled with the
+content-scanning extension, and it is allowed only the the ACL defined by
+\acl@_smtp@_mime\. It causes the current MIME part to be decoded into a file.
+For details, see chapter ~~CHAPexiscan.
+.nem
+
+
.item "dnslists = <<list of domain names and other data>>"
.index DNS list||in ACL
.index black list (DNS)
.index ~~ACL||testing a DNS list
This condition checks for entries in DNS black lists. These are also known as
`RBL lists', after the original Realtime Blackhole List, but note that the use
-of the lists at \*mail-abuse.org*\ now carries a charge.
-There are too many different variants of this condition to describe briefly
+of the lists at \*mail-abuse.org*\ now carries a charge.
+There are too many different variants of this condition to describe briefly
here. See sections ~~SECTmorednslists--~~SECTmorednslistslast for details.

.item "domains = <<domain list>>"
@@ -21698,21 +21740,49 @@
the result of the lookup is placed in \$local@_part@_data$\ until the next
\local@_parts\ test.

+
+.em
+.item "malware = <<option>>"
+This condition is available only when Exim is compiled with the
+content-scanning extension. It causes the incoming message to be scanned for
+viruses. For details, see chapter ~~CHAPexiscan.
+.nem
+
+
+.em
+.item "mime@_regex = <<list of regular expressions>>"
+This condition is available only when Exim is compiled with the
+content-scanning extension, and it is allowed only the the ACL defined by
+\acl@_smtp@_mime\. It causes the current MIME part to be scanned for a match
+with any of the regular expressions. For details, see chapter ~~CHAPexiscan.
+.nem
+
+
.item "recipients = <<address list>>"
.index recipient||ACL checking
.index ~~ACL||testing a recipient
This condition is relevant only after a \\RCPT\\ command. It checks the entire
recipient address against a list of recipients.

+
+.em
+.item "regex = <<list of regular expressions>>"
+This condition is available only when Exim is compiled with the
+content-scanning extension. It causes the incoming message to be scanned
+for a match with any of the regular expressions. For details, see chapter
+~~CHAPexiscan.
+.nem
+
+
.item "sender@_domains = <<domain list>>"
.index sender||ACL checking
.index ~~ACL||testing a sender domain
This condition tests the domain of the sender of the message against the given
domain list.
\**Note**\: the domain of the sender address is in
-\$sender@_address@_domain$\. It is \*not*\ put in \$domain$\ during the testing
-of this condition. This is an exception to the general rule for testing
-domain lists. It is done this way so that, if this condition is used in an
+\$sender@_address@_domain$\. It is \*not*\ put in \$domain$\ during the testing
+of this condition. This is an exception to the general rule for testing
+domain lists. It is done this way so that, if this condition is used in an
ACL for a \\RCPT\\ command, the recipient's domain (which is in \$domain$\) can
be used to influence the sender checking.

@@ -21725,6 +21795,15 @@
senders = :
.endd

  +
  +.em
  +.item "spam = <<username>>"
  +This condition is available only when Exim is compiled with the
  +content-scanning extension. It causes the incoming message to be scanned by
  +SpamAssassin. For details, see chapter ~~CHAPexiscan.
  +.nem
  +
  +
   .item "verify = certificate"
   .index TLS||client certificate verification
   .index certificate||verification of client
  @@ -21740,12 +21819,21 @@
   .index sender||verifying in header
   .index verifying||sender in header
   This condition is relevant only in an ACL that is run after a message has been
  -received, that is, in an ACL specified by \acl@_smtp@_data\. It checks that
  -there is a verifiable sender address in at least one of the ::Sender::,
  -::Reply-To::, or ::From:: header lines. Details of address verification and the
  -options are given later, starting at section ~~SECTaddressverification. You can
  -combine this condition with the \senders\ condition to restrict it to bounce
  -messages only:
  +received, that is, in an ACL specified by \acl@_smtp@_data\
  +.em
  +or \acl@_not@_smtp\. It checks that there is a verifiable address in at least
  +one of the ::Sender::, ::Reply-To::, or ::From:: header lines. Such an address
  +is loosely thought of as a `sender' address (hence the name of the test).
  +However, an address that appears in one of these headers need not be an address
  +that accepts bounce messages; only sender addresses in envelopes are required
  +to accept bounces. Therefore, if you use the callout option on this check, you
  +might want to arrange for a non-empty address in the \\MAIL\\ command.
  +.nem
  +
  +Details of address verification and the options are given later, starting at
  +section ~~SECTaddressverification (callouts are described in section
  +~~SECTcallver). You can combine this condition with the \senders\ condition to
  +restrict it to bounce messages only:
   .display asis
   deny    senders = :
           message = A valid sender header is required for bounces
  @@ -21760,7 +21848,7 @@
   received, that is, in an ACL specified by \acl@_smtp@_data\
   or \acl@_not@_smtp\.
   It checks the syntax of all header lines that can contain lists of addresses
  -(::Sender::, ::From::, ::Reply-To::, ::To::, ::Cc::, and ::Bcc::). 
  +(::Sender::, ::From::, ::Reply-To::, ::To::, ::Cc::, and ::Bcc::).
   Unqualified addresses (local parts without domains) are permitted only in
   locally generated messages and from hosts that match
   \sender@_unqualified@_hosts\ or \recipient@_unqualified@_hosts\, as
  @@ -21809,7 +21897,7 @@
   one of its aliases, does, when it is itself looked up in the DNS, yield the
   original IP address.


-If this condition is used for a locally generated message (that is, when there
+If this condition is used for a locally generated message (that is, when there
is no client host involved), it always succeeds.


  @@ -21817,8 +21905,8 @@
   .index ~~ACL||verifying sender
   .index sender||verifying
   .index verifying||sender
  -This condition is relevant only after a 
  -\\MAIL\\ or \\RCPT\\ command, or after a message has been received (the 
  +This condition is relevant only after a
  +\\MAIL\\ or \\RCPT\\ command, or after a message has been received (the
   \acl@_smtp@_data\ or \acl@_not@_smtp\ ACLs).
   If the message's sender is empty (that is, this is a bounce message), the
   condition is true. Otherwise, the sender address is verified. Details of
  @@ -21840,24 +21928,38 @@
   .index black list (DNS)
   .index ~~ACL||testing a DNS list
   In its simplest form, the \dnslists\ condition tests whether the calling host
  -is on a DNS list by looking up the inverted IP address in one or more DNS
  -domains. For example, if the calling host's IP address is 192.168.62.43, and
  -the ACL statement is
  +is on at least one of a number of DNS lists by looking up the inverted IP
  +address in one or more DNS domains. For example, if the calling host's IP
  +address is 192.168.62.43, and the ACL statement is
   .display asis
   deny dnslists = blackholes.mail-abuse.org : \
                   dialups.mail-abuse.org
   .endd
  -the following domains are looked up:
  +the following records are looked up:
   .display asis
   43.62.168.192.blackholes.mail-abuse.org
  -43.62.168.192.dialups.mail-abuse.org                            
  +43.62.168.192.dialups.mail-abuse.org
  +.endd
  +.em
  +As soon as Exim finds an existing DNS record, processing of the list stops.
  +Thus, multiple entries on the list provide an `or' conjunction. If you want to
  +test that a host is on more than one list (an `and' conjunction), you can use
  +two separate conditions:
  +.display asis
  +deny dnslists = blackholes.mail-abuse.org
  +     dnslists = dialups.mail-abuse.org
   .endd
  +.nem
   If a DNS lookup times out or otherwise fails to give a decisive answer, Exim
  -behaves as if the host is not on the relevant list. This is usually the
  -required action when \dnslists\ is used with \deny\ (which is the most common
  -usage), because it prevents a DNS failure from blocking mail. However, you can
  -change this behaviour by putting one of the following special items in the
  -list:
  +behaves as if the host
  +.em
  +does not match the list item, that is, as if the DNS record does not exist. If
  +there are further items in the DNS list, they are processed.
  +.nem
  +This is usually the required action when \dnslists\ is used with \deny\ (which
  +is the most common usage), because it prevents a DNS failure from blocking
  +mail. However, you can change this behaviour by putting one of the following
  +special items in the list:
   .index \"+include@_unknown"\
   .index \"+exclude@_unknown"\
   .index \"+defer@_unknown"\
  @@ -21885,15 +21987,29 @@
   connections (but your local name server cache should be active).



  +.em
  +.section Specifying the IP address for a DNS list lookup
  +.index DNS list||keyed by explicit IP address
  +By default, the IP address that is used in a DNS list lookup is the IP address
  +of the calling host. However, you can specify another IP address by listing it
  +after the domain name, introduced by a slash. For example:
  +.display asis
  +deny dnslists = black.list.tls/192.168.1.2
  +.endd
  +This feature is not very helpful with explicit IP addresses; it is intended for
  +use with IP addresses that are looked up, for example, the IP addresses of the
  +MX hosts or nameservers of an email sender address. For an example, see section
  +~~SECTmulkeyfor below.
  +.nem
  +
  +
   .section DNS lists keyed on domain names
  +.index DNS list||keyed by domain name
   There are some lists that are keyed on domain names rather than inverted IP
   addresses (see for example the \*domain based zones*\ link at
  -\?http://www.rfc-ignorant.org/?\). 
  -.em
  -No reversing of components is used with these lists.
  -.nem
  -You can change the name that is looked up in a DNS list by adding additional
  -data to a \dnslists\ item, introduced by a slash. For example,
  +\?http://www.rfc-ignorant.org/?\). No reversing of components is used with
  +these lists. You can change the name that is looked up in a DNS list by listing
  +it after the domain name, introduced by a slash. For example,
   .display asis
   deny  message  = Sender's domain is listed at $dnslist_domain
         dnslists = dsn.rfc-ignorant.org/$sender_address_domain
  @@ -21905,10 +22021,86 @@
   .display asis
   tld.example.dsn.rfc-ignorant.org
   .endd
  -You can mix entries with and without additional data in the same \dnslists\
  -condition.
  +.em
  +A single \dnslists\ condition can contain entries for both names and IP
  +addresses. For example:
  +.display asis
  +deny dnslists = sbl.spamhaus.org : \
  +                dsn.rfc-ignorant.org/$sender_address_domain
  +.endd
  +The first item checks the sending host's IP address; the second checks a domain
  +name. The whole condition is true if either of the DNS lookups succeeds.
  +.nem
  +
  +
  +.em
  +.section Multiple explicit keys for a DNS list
  +.rset SECTmulkeyfor "~~chapter.~~section"
  +.index DNS list||multiple keys for
  +The syntax described above for looking up explicitly-defined values (either
  +names or IP addresses) in a DNS blacklist is a simplification. After the domain
  +name for the DNS list, what follows the slash can in fact be a list of items.
  +As with all lists in Exim, the default separator is a colon. However, because
  +this is a sublist within the list of DNS blacklist domains, it is necessary
  +either to double the separators like this:
  +.display asis
  +dnslists = black.list.tld/name.1::name.2
  +.endd
  +or to change the separator character, like this:
  +.display asis
  +dnslists = black.list.tld/<;name.1;name.2
  +.endd
  +If an item in the list is an IP address, it is inverted before the DNS
  +blacklist domain is appended. If it is not an IP address, no inversion
  +occurs. Consider this condition:
  +.display asis
  +dnslists = black.list.tld/<;192.168.1.2;a.domain
  +.endd
  +The DNS lookups that occur are:
  +.display asis
  +2.1.168.192.black.list.tld
  +a.domain.black.list.tld
  +.endd
  +Once a DNS record has been found (that matches a specific IP return
  +address, if specified -- see section ~~SECTaddmatcon), no further lookups are
  +done. If there is a temporary DNS error, the rest of the sublist of domains or
  +IP addresses is tried. A temporary error for the whole dnslists item occurs
  +only if no other DNS lookup in this sublist succeeds. In other words, a
  +successful lookup for any of the items in the sublist overrides a temporary
  +error for a previous item.
  +
  +The ability to supply a list of items after the slash is in some sense just a
  +syntactic convenience. These two examples have the same effect:
  +.display asis
  +dnslists = black.list.tld/a.domain : black.list.tld/b.domain
  +dnslists = black.list.tld/a.domain::b.domain
  +.endd
  +However, when the data for the list is obtained from a lookup, the second form
  +is usually much more convenient. Consider this example:
  +.display asis
  +deny message  =  The mail servers for the domain \
  +                 $sender_address_domain \
  +                 are listed at $dnslist_domain ($dnslist_value); \
  +                 see $dnslist_text.
  +     dnslists =  sbl.spamhaus.org/<|${lookup dnsdb {>|a=<|\
  +                                    ${lookup dnsdb {>|mxh=\
  +                                    $sender_address_domain} }} }
  +.endd
  +Note the use of \">|"\ in the dnsdb lookup to specify the separator for
  +multiple DNS records. The inner dnsdb lookup produces a list of MX hosts
  +and the outer dnsdb lookup finds the IP addresses for these hosts. The result
  +of expanding the condition might be something like this:
  +.display asis
  +dnslists = sbl.spahmaus.org/<|192.168.2.3|192.168.5.6|...
  +.endd
  +Thus, this example checks whether or not the IP addresses of the sender
  +domain's mail servers are on the Spamhaus black list.
  +.nem
  +
  +


.section Data returned by DNS lists
+.index DNS list||data returned from
DNS lists are constructed using address records in the DNS. The original RBL
just used the address 127.0.0.1 on the right hand side of each record, but the
RBL+ list and some other lists use a number of values with different meanings.
@@ -21926,6 +22118,7 @@
Some DNS lists may return more than one address record.

.section Variables set from DNS lists
+.index DNS list||variables set from
When an entry is found in a DNS list, the variable \$dnslist@_domain$\
contains the name of the domain that matched, \$dnslist@_value$\ contains the
data from the entry, and \$dnslist@_text$\ contains the contents of any
@@ -21945,9 +22138,11 @@


.section Additional matching conditions for DNS lists
-If you add an equals sign and an IP address after a \dnslists\ domain name, you
-can restrict its action to DNS records with a matching right hand side. For
-example,
+.rset SECTaddmatcon "~~chapter.~~section"
+.index DNS list||matching specific returned data
+You can add an equals sign and an IP address after a \dnslists\ domain name in
+order to restrict its action to DNS records with a matching right hand side.
+For example,
.display asis
deny dnslists = rblplus.mail-abuse.org=127.0.0.2
.endd
@@ -21955,13 +22150,6 @@
any address record is considered to be a match. If more than one address record
is found on the list, they are all checked for a matching right-hand side.

  -If you want to specify a constraining address and also change the name that is
  -looked up, the address list must be specified first. For example:
  -.display asis
  -deny dnslists = dsn.rfc-ignorant.org\
  -                =127.0.0.2/$sender_address_domain
  -.endd
  -
   More than one IP address may be given for checking, using a comma as a
   separator. These are alternatives -- if any one of them matches, the \dnslists\
   condition is true. For example:
  @@ -21969,6 +22157,14 @@
   deny  dnslists = a.b.c=127.0.0.2,127.0.0.3
   .endd


  +If you want to specify a constraining address list and also specify names or IP
  +addresses to be looked up, the constraining address list must be specified
  +first. For example:
  +.display asis
  +deny dnslists = dsn.rfc-ignorant.org\
  +                =127.0.0.2/$sender_address_domain
  +.endd
  +
   If the character `&' is used instead of `=', the comparison for each listed
   IP address is done by a bitwise `and' instead of by an equality test. In
   other words, the listed addresses are used as bit masks. The comparison is
  @@ -22034,7 +22230,9 @@


   .section DNS lists and IPv6
   .rset SECTmorednslistslast "~~chapter.~~section"
  -If Exim is asked to do a dnslist lookup for an IPv6 address, it inverts it 
  +.index IPv6||DNS black lists
  +.index DNS list||IPv6 usage
  +If Exim is asked to do a dnslist lookup for an IPv6 address, it inverts it
   nibble by nibble. For example, if the calling host's IP address is
   3ffe:ffff:836f:0a00:000a:0800:200a:c031, Exim might look up
   .display asis
  @@ -22047,13 +22245,17 @@
   .display asis
   *.3.some.list.example.    A    127.0.0.1
   .endd
  -is probably intended to put the entire 3.0.0.0/8 IPv4 network on the list. 
  -Unfortunately, it also matches the entire 3@:@:/124 IPv6 network.
  +is probably intended to put the entire 3.0.0.0/8 IPv4 network on the list.
  +Unfortunately, it also matches the entire 3@:@:/4 IPv6 network.


  -You can exclude IPv6 addresses from DNS lookups by making use of a suitable 
  +You can exclude IPv6 addresses from DNS lookups by making use of a suitable
   \condition\ condition, as in this example:
   .display asis
  -deny   condition = ${if isip4{$sender_host_address}{yes}{no}}
  +.newline
  +.em
  +deny   condition = ${if isip4{$sender_host_address}}
  +.nem
  +.newline
          dnslists  = some.list.example
   .endd


@@ -22071,14 +22273,51 @@
verify = sender/callout
verify = recipient/defer_ok/callout=10s,defer_ok
.endd
-The first stage of verification is to run the address through the routers, in
-`verify mode'. Routers can detect the difference between verification and
-routing for delivery, and their actions can be varied by a number of generic
-options such as \verify\ and \verify@_only\ (see chapter ~~CHAProutergeneric).
-
-If there is a defer error while doing this verification routing, the ACL
+.em
+The first stage of address verification, which always happens, is to run the
+address through the routers, in `verify mode'. Routers can detect the
+difference between verification and routing for delivery, and their actions can
+be varied by a number of generic options such as \verify\ and \verify@_only\
+(see chapter ~~CHAProutergeneric). If routing fails, verification fails.
+The available options are as follows:
+.numberpars $.
+If the \callout\ option is specified, successful routing to one or more remote
+hosts is followed by a `callout' to those hosts as an additional check.
+Callouts and their sub-options are discussed in the next section.
+.nextp
+If there is a defer error while doing verification routing, the ACL
normally returns `defer'. However, if you include \defer@_ok\ in the options,
-the condition is forced to be true instead.
+the condition is forced to be true instead. Note that this is a main
+verification option as well as a suboption for callouts.
+.nextp
+The \no@_details\ option is covered in section ~~SECTsenaddver, which discusses
+the reporting of sender address verification failures.
+.endp
+
+.index verifying||address, differentiating failures
+After an address verification failure, \$sender@_verify@_failure$\ or
+\$recipient@_verify@_failure$\ (as appropriate) contains one of the following
+words:
+.numberpars $.
+\qualify\: The address was unqualified (no domain), and the message
+was neither local nor came from an exempted host.
+.nextp
+\route\: Routing failed.
+.nextp
+\mail\: Routing succeeded, and a callout was attempted; rejection
+occurred at or before the \\MAIL\\ command (that is, on initial
+connection, \\HELO\\, or \\MAIL\\).
+.nextp
+\recipient\: The \\RCPT\\ command in a callout was rejected.
+.nextp
+\postmaster\: The postmaster check in a callout was rejected.
+.endp
+
+The main use of these variables is expected to be to distinguish between
+rejections of \\MAIL\\ and rejections of \\RCPT\\ in callouts.
+
+.nem
+

.section Callout verification
.rset SECTcallver "~~chapter.~~section"
@@ -22095,50 +22334,50 @@
verifying an address. However, Exim does cache the results of callouts, which
helps to reduce the cost. Details of caching are in the next section.

-.em
-Recipient callouts are usually used only between hosts that are controlled by
-the same administration. For example, a corporate gateway host could use
+Recipient callouts are usually used only between hosts that are controlled by
+the same administration. For example, a corporate gateway host could use
callouts to check for valid recipients on an internal mailserver.
-.nem
-A successful callout does not guarantee that a real delivery to the address
-would succeed; on the other hand, a failing callout does guarantee that
+A successful callout does not guarantee that a real delivery to the address
+would succeed; on the other hand, a failing callout does guarantee that
a delivery would fail.

If the \callout\ option is present on a condition that verifies an address, a
second stage of verification occurs if the address is successfully routed to
one or more remote hosts. The usual case is routing by a \%dnslookup%\ or a
-\%manualroute%\ router, where the router specifies the hosts. However, if a
-router that does not set up hosts routes to an \%smtp%\ transport with a
+\%manualroute%\ router, where the router specifies the hosts. However, if a
+router that does not set up hosts routes to an \%smtp%\ transport with a
\hosts\ setting, the transport's hosts are used. If an \%smtp%\ transport has
\hosts@_override\ set, its hosts are always used, whether or not the router
supplies a host list.

The port that is used is taken from the transport, if it is specified and is a
remote transport. (For routers that do verification only, no transport need be
-specified.) Otherwise, the default SMTP port is used. If a remote transport
-specifies an outgoing interface, this is used; otherwise the interface is not
+specified.) Otherwise, the default SMTP port is used. If a remote transport
+specifies an outgoing interface, this is used; otherwise the interface is not
specified.

For a sender callout check, Exim makes SMTP connections to the remote hosts, to
test whether a bounce message could be delivered to the sender address. The
following SMTP commands are sent:
.display
-HELO <<primary host name>>
+.newline
+.em
+HELO <<smtp active host name>>
+.nem
+.newline
MAIL FROM:@<@>
RCPT TO:<<the address to be tested>>
QUIT
.endd
\\LHLO\\ is used instead of \\HELO\\ if the transport's \protocol\ option is
-set to `lmtp'.
+set to `lmtp'.

-.em
-A recipient callout check is similar. By default, it also uses an empty address
-for the sender. This default is chosen because most hosts do not make use of
-the sender address when verifying a recipient. Using the same address means
-that a single cache entry can be used for each recipient. Some sites, however,
-do make use of the sender address when verifying. These are catered for by the
-\use@_sender\ and \use@_postmaster\ options, described in the next section.
-.nem
+A recipient callout check is similar. By default, it also uses an empty address
+for the sender. This default is chosen because most hosts do not make use of
+the sender address when verifying a recipient. Using the same address means
+that a single cache entry can be used for each recipient. Some sites, however,
+do make use of the sender address when verifying. These are catered for by the
+\use@_sender\ and \use@_postmaster\ options, described in the next section.

If the response to the \\RCPT\\ command is a 2$it{xx} code, the verification
succeeds. If it is 5$it{xx}, the verification fails. For any other condition,
@@ -22147,9 +22386,11 @@
\callout\ option is given, in which case the condition is forced to succeed.


+
+
.section Additional parameters for callouts
.rset CALLaddparcall "~~chapter.~~section"
-.index callout||timeout, specifying
+.index callout||additional parameters for
The \callout\ option can be followed by an equals sign and a number of optional
parameters, separated by commas. For example:
.display asis
@@ -22159,33 +22400,107 @@
separate verify options, is retained for backwards compatibility, but is now
deprecated. The additional parameters for \callout\ are as follows:

-.numberpars $.
-<<a time>>: This specifies the timeout that applies for the callout attempt to
-each host. For example:
+.startitems
+
+.item "<<a time interval>>"
+.index callout||timeout, specifying
+This specifies the timeout that applies for the callout attempt to each host.
+For example:
.display asis
verify = sender/callout=5s
.endd
The default is 30 seconds. The timeout is used for each response from the
remote host.
-.nextp
+.em
+It is also used for the intial connection, unless overridden by the \connect\
+parameter.
+.nem
+
+.em
+.item "connect = <<time interval>>"
+.index callout||connection timeout, specifying
+This parameter makes it possible to set a different (usually
+smaller) timeout for making the SMTP connection.
+For example:
+.display asis
+verify = sender/callout=5s,connect=1s
+.endd
+If not specified, this timeout defaults to the general timeout value.
+.nem
+
+.item "defer@_ok"
.index callout||defer, action on
-\defer@_ok\: Failure to contact any host, or any other kind of temporary error
-is treated as success by the ACL. However, the cache is not updated in this
-circumstance.
-.nextp
+When this parameter is present, failure to contact any host, or any other kind
+of temporary error, is treated as success by the ACL. However, the cache is not
+updated in this circumstance.
+
+.em
+.item "mailfrom = <<email address>>"
+.index callout||sender when verifying header
+When verifying addresses in header lines using the \header@_sender\
+verification option, Exim behaves by default as if the addresses are envelope
+sender addresses from a message. Callout verification therefore tests to see
+whether a bounce message could be delivered, by using an empty address in the
+\\MAIL\\ command. However, it is arguable that these addresses might never be
+used as envelope senders, and could therefore justifiably reject bounce
+messages (empty senders). The \mailfrom\ callout parameter allows you to
+specify what address to use in the \\MAIL\\ command. For example:
+.display asis
+require verify = header_sender/callout=mailfrom=abcd@???
+.endd
+This parameter is available only for the \header@_sender\ verification option.
+.nem
+
+.em
+.item "maxwait = <<time interval>>"
+.index callout||overall timeout, specifying
+This parameter sets an overall timeout for performing a callout verification.
+For example:
+.display asis
+verify = sender/callout=5s,maxwait=30s
+.endd
+This timeout defaults to four times the callout timeout for individual SMTP
+commands. The overall timeout applies when there is more than one host that can
+be tried. The timeout is checked before trying the next host. This prevents
+very long delays if there are a large number of hosts and all are timing out
+(for example, when network connections are timing out).
+.nem
+
+.item "no@_cache"
.index callout||cache, suppressing
.index caching||callout, suppressing
-\no@_cache\: The callout cache is neither read nor updated.
-.nextp
+When this parameter is given, the callout cache is neither read nor updated.
+
+.item "postmaster"
.index callout||postmaster, checking
-\postmaster\: A successful callout check is followed by a similar check for the
-local part \*postmaster*\ at the same domain. If this address is rejected, the
-callout fails. The result of the postmaster check is recorded in a cache
-record; if it is a failure, this is used to fail subsequent callouts for the
-domain without a connection being made, until the cache record expires.
-.nextp
+When this parameter is set, a sucessful callout check is followed by a similar
+check for the local part \*postmaster*\ at the same domain. If this address is
+rejected, the callout fails. The result of the postmaster check is recorded in
+a cache record; if it is a failure, this is used to fail subsequent callouts
+for the domain without a connection being made, until the cache record expires.
+
+.em
+.item "postmaster@_mailfrom = <<email address>>"
+The postmaster check uses an empty sender in the \\MAIL\\ command by default.
+You can use this parameter to do a postmaster check using a different address.
+For example:
+.display asis
+require verify = sender/callout=postmaster_mailfrom=abc@???
+.endd
+If both \postmaster\ and \postmaster@_mailfrom\ are present, the rightmost one
+overrides. The \postmaster\ parameter is equivalent to this example:
+.display asis
+require verify = sender/callout=postmaster_mailfrom=
+.endd
+\**Warning**\: The caching arrangements for postmaster checking do not take
+account of the sender address. It is assumed that either the empty address or
+a fixed non-empty address will be used. All that Exim remembers is that the
+postmaster check for the domain succeeded or failed.
+.nem
+
+.item "random"
.index callout||`random' check
-\random\: Before doing the normal callout check, Exim does a
+When this parameter is set, before doing the normal callout check, Exim does a
check for a `random' local part at the same domain. The local part is not
really random -- it is defined by the expansion of the option
\callout@_random@_local@_part\, which defaults to
@@ -22197,29 +22512,53 @@
specific local parts. If the `random' check succeeds, the result is saved in
a cache record, and used to force the current and subsequent callout checks to
succeed without a connection being made, until the cache record expires.
-.nextp
+
+.item "use@_postmaster"
.index callout||sender for recipient check
-.em
-\use@_postmaster\: This option applies to recipient callouts only. For example:
+This parameter applies to recipient callouts only. For example:
.display asis
deny !verify = recipient/callout=use_postmaster
.endd
It causes a non-empty postmaster address to be used in the \\MAIL\\ command
when performing the callout. The local part of the address is \"postmaster"\
and the domain is the contents of \$qualify@_domain$\.
-.nextp
-\use@_sender\: This option applies to recipient callouts only. For example:
+
+.item "use@_sender"
+This option applies to recipient callouts only. For example:
.display asis
require verify = recipient/callout=use_sender
.endd
It causes the message's actual sender address to be used in the \\MAIL\\
-command when performing the callout, instead of an empty address. The cache for
-such callouts is keyed by the sender/recipient combination; thus, for any given
-recipient, many more actual callouts are performed than when an empty sender or
-postmaster is used. This option should be set only when you know that the
-called hosts make use of the sender when checking recipients.
+command when performing the callout, instead of an empty address. There is no
+need to use this option unless you know that the called hosts make use of the
+sender when checking recipients. If used indiscriminately, it reduces the
+usefulness of callout caching.
+
+.enditems
+
+.em
+If you use any of the parameters that set a non-empty sender for the \\MAIL\\
+command (\mailfrom\, \postmaster@_mailfrom\, \use@_postmaster\, or
+\use@_sender\), you should think about possible loops. Recipient checking is
+usually done between two hosts that are under the same management, and the host
+that receives the callouts is not normally configured to do callouts itself.
+Therefore, it is normally safe to use \use@_postmaster\ or \use@_sender\ in
+these circumstances.
+
+However, if you use a non-empty sender address for a callout to an arbitrary
+host, there is the likelihood that the remote host will itself initiate a
+callout check back to your host. As it is checking what appears to be a message
+sender, it is likely to use an empty address in \\MAIL\\, thus avoiding a
+callout loop. However, to be on the safe side it would be best to set up your
+own ACLs so that they do not do sender verification checks when the recipient
+is the address you use for header sender or postmaster callout checking.
+
+Another issue to think about when using non-empty senders for callouts is
+caching. When you set \mailfrom\ or \use@_sender\, the cache record is keyed by
+the sender/recipient combination; thus, for any given recipient, many more
+actual callouts are performed than when an empty sender or postmaster is used.
+
.nem
-.endp


.section Callout caching
@@ -22227,10 +22566,10 @@
.index hints database||callout cache
.index callout||caching
.index caching||callout
-Exim caches the results of callouts in order to reduce the amount of resources
+Exim caches the results of callouts in order to reduce the amount of resources
used, unless you specify the \no@_cache\ parameter with the \callout\ option.
-A hints database called `callout' is used for the cache. Two different record
-types are used: one records the result of a callout check for a specific
+A hints database called `callout' is used for the cache. Two different record
+types are used: one records the result of a callout check for a specific
address, and the other records information that applies to the entire domain
(for example, that it accepts the local part \*postmaster*\).

@@ -22243,13 +22582,11 @@
(default 2h) and \callout@_positive@_expire\ (default 24h), respectively.

If a host gives a negative response to an SMTP connection, or rejects any
-commands up to and including
+commands up to and including
.display asis
MAIL FROM:<>
.endd
-.em
(but not including the \\MAIL\\ command with a non-empty address),
-.nem
any callout attempt is bound to fail. Exim remembers such failures in a
domain cache record, which it uses to fail callouts for the domain without
making new connections, until the domain record times out. There are two
@@ -22263,12 +22600,13 @@
ensures that, for example, a host that stops accepting `random' local parts
will eventually be noticed.

-The callout caching mechanism is based entirely on the domain of the
-address that is being tested. If the domain routes to several hosts, it is
-assumed that their behaviour will be the same.
+The callout caching mechanism is based on the domain of the address that is
+being tested. If the domain routes to several hosts, it is assumed that their
+behaviour will be the same.


   .section Sender address verification reporting
  +.rset SECTsenaddver "~~chapter.~~section"
   .index verifying||suppressing error details
   When sender verification fails in an ACL, the details of the failure are
   given as additional output lines before the 550 response to the relevant
  @@ -22313,145 +22651,860 @@
   way of redirecting different local parts to the same mailbox. It means, for
   example, that a pair of alias entries of the form
   .display asis
  -A.Wol:   aw123
  -aw123:   :fail: Gone away, no forwarding address
  +A.Wol:   aw123
  +aw123:   :fail: Gone away, no forwarding address
  +.endd
  +work as expected, with both local parts causing verification failure. When a
  +redirection generates more than one address, the behaviour is more like a
  +mailing list, where the existence of the alias itself is sufficient for
  +verification to succeed.
  +
  +
  +.section Using an ACL to control relaying
  +.rset SECTrelaycontrol "~~chapter.~~section"
  +.index ~~ACL||relay control
  +.index relaying||control by ACL
  +.index policy control||relay control
  +An MTA is said to \*relay*\ a message if it receives it from some host and
  +delivers it directly to another host as a result of a remote address contained
  +within it. Redirecting a local address via an alias or forward file and then
  +passing the message on to another host is not relaying,
  +.index `percent hack'
  +but a redirection as a result of the `percent hack' is.
  +
  +Two kinds of relaying exist, which are termed `incoming' and `outgoing'. A host
  +which is acting as a gateway or an MX backup is concerned with incoming
  +relaying from arbitrary hosts to a specific set of domains. On the other hand,
  +a host which is acting as a smart host for a number of clients is concerned
  +with outgoing relaying from those clients to the Internet at large. Often the
  +same host is fulfilling both functions, as illustrated in the diagram below,
  +but in principle these two kinds of relaying are entirely independent. What is
  +not wanted is the transmission of mail from arbitrary remote hosts through your
  +system to arbitrary domains.
  +.if ~~sys.fancy
  +.figure "Controlled relaying" rm
  +.indent 0
  +.call aspic -sgcal -nv
  +centre ~~sys.linelength;
  +magnify 0.8;
  +boundingbox 30;
  +textdepth 16;
  +    boxwidth 120;
  +    boxdepth 44;
  +A:  box "Arbitrary" "remote hosts";
  +C:  ibox;
  +D:  box "Arbitrary" "domains";
  +    iline down 50 from bottom of C;
  +H:  box width 180 "Local host";
  +    iline down 50;
  +E:  ibox;
  +SH: box "Specific" "hosts";
  +SD: box join right to E "Specific" "domains";
  +    arcarrow clockwise from top of SH to bottom of D plus (-10,-4)
  +      via right of H plus (-20,0);
  +    arcarrow clockwise from bottom of A to top of SD plus (10,4)
  +      via left of H plus (20,0);
  +
  +    ibox join left to right of H "$it{Outgoing}";
  +    goto H;
  +    ibox join right to left of H "$it{Incoming}";
  +
  +L:  line dashed from right of A to top of H plus (-15,0);
  +    arc dashed to top of H plus (15,0);
  +    arrow dashed to left of D plus (-2,0);
  +
  +    arrow dashed back up 72 right 32 from middle of L plus (8,0);
  +    text at end plus (0, 4) "$it{Not wanted}";
  +.endcall
  +.endfigure
  +.elif !~~html
  +.display asis
  +   --------------    -----------
  +   | Arbitrary  |    |Arbitrary|
  +   |remote hosts|    | domains |
  +   --------------    -----------
  + I       v                ^       O
  + n       v                ^       u
  + c    ---v----------------^---    t
  + o    |  v     Local      ^  |    g
  + m    |  v      host      ^  |    o
  + i    ---v----------------^---    i
  + n       v                ^       n
  + g       v                ^       g
  +      Specific         Specific
  +      domains           hosts
  +.endd
  +.else
  +[(IMG SRC="relaying.gif" alt="Controlled relaying")][(br)]
  +.fi
  +
  +You can implement relay control by means of suitable statements in the ACL that
  +runs for each \\RCPT\\ command. For convenience, it is often easiest to use
  +Exim's named list facility to define the domains and hosts involved. For
  +example, suppose you want to do the following:
  +.numberpars $.
  +Deliver a number of domains to mailboxes on the local host (or process them
  +locally in some other way). Let's say these are \*my.dom1.example*\ and
  +\*my.dom2.example*\.
  +.nextp
  +Relay mail for a number of other domains for which you are the secondary MX.
  +These might be \*friend1.example*\ and \*friend2.example*\.
  +.nextp
  +Relay mail from the hosts on your local LAN, to whatever domains are involved.
  +Suppose your LAN is 192.168.45.0/24.
  +.endp
  +In the main part of the configuration, you put the following definitions:
  +.display asis
  +domainlist local_domains = my.dom1.example : my.dom2.example
  +domainlist relay_domains = friend1.example : friend2.example
  +hostlist   relay_hosts   = 192.168.45.0/24
  +.endd
  +Now you can use these definitions in the ACL that is run for every \\RCPT\\
  +command:
  +.display asis
  +acl_check_rcpt:
  +  accept domains = +local_domains : +relay_domains
  +  accept hosts   = +relay_hosts
  +.endd
  +The first statement accepts any \\RCPT\\ command that contains an address in
  +the local or relay domains. For any other domain, control passes to the second
  +statement, which accepts the command only if it comes from one of the relay
  +hosts. In practice, you will probably want to make your ACL more sophisticated
  +than this, for example, by including sender and recipient verification. The
  +default configuration includes a more comprehensive example, which is described
  +in chapter ~~CHAPdefconfil.
  +
  +
  +.section Checking a relay configuration
  +.rset SECTcheralcon "~~chapter.~~section"
  +.index relaying||checking control of
  +You can check the relay characteristics of your configuration in the same way
  +that you can test any ACL behaviour for an incoming SMTP connection, by using
  +the \-bh-\ option to run a fake SMTP session with which you interact.
  +
  +For specifically testing for unwanted relaying, the host
  +\*relay-test.mail-abuse.org*\ provides a useful service. If you telnet to this
  +host from the host on which Exim is running, using the normal telnet port, you
  +will see a normal telnet connection message and then quite a long delay. Be
  +patient. The remote host is making an SMTP connection back to your host, and
  +trying a number of common probes to test for open relay vulnerability. The
  +results of the tests will eventually appear on your terminal.
  +
  +
  +
  +
  +.
  +.
  +.
  +.
  +. ============================================================================
  +.chapter Content scanning using the `exiscan' features
  +.set runningfoot "content scanning"
  +.rset CHAPexiscan "~~chapter"
  +.index content scanning
  +.em
  +The content-scanning extension of Exim, also known as `exiscan', was originally
  +implemented as a patch by Tom Kistner. The code was integrated into the main
  +source for Exim release 4.50, and Tom continues to maintain it. Most of the
  +wording of this chapter is taken from Tom's exiscan specification.
  +
  +If you want to include the content-scanning features when you compile Exim, you
  +need to arrange for \\WITH@_CONTENT@_SCAN\\ to be defined in your
  +\(Local/Makefile)\. When you do that, the Exim binary is built with:
  +.numberpars $.
  +An additional ACL (\acl@_smtp@_mime\) that is run for all MIME parts.
  +.nextp
  +Additional ACL conditions and modifiers: \decode\, \malware\, \mime@_regex\,
  +\regex\, and \spam\. These can be used in the ACL that is run at the end of
  +message reception (the \acl@_smtp@_data\ ACL).
  +.nextp
  +Additional expansion variables that are set in the new ACL and by the new
  +conditions.
  +.nextp
  +Two new main configuration options: \av@_scanner\ and \spamd@_address\.
  +.endp
  +There is another content-scanning configuration option for \(Local/Makefile)\,
  +called \\WITH@_OLD@_DEMIME\\. If this is set, the old, deprecated \demime\ ACL
  +condition is compiled, in addition to all the other content-scanning features.
  +
  +Content-scanning is continually evolving, and new features are still being
  +added. While such features are still unstable and liable to incompatible
  +changes, they are made available in Exim by setting options whose names begin
  +\\EXPERIMENTAL@_\\ in \(Local/Makefile)\. Such features are not documented in
  +this manual. You can find out about them by reading the file called
  +\(doc/experimental.txt)\.
  +
  +All the content-scanning facilites work on a MBOX copy of the message that is
  +temporarily created in a file called:
  +.display
  +<<spool@_directory>>/scan/<<message@_id>>/<<message@_id>>.eml
  +.endd
  +The \(.eml)\ extension is a friendly hint to virus scanners that they can
  +expect an MBOX-like structure inside that file. The file is created when the
  +first exiscan facility is called. Subsequent calls to exiscan conditions open
  +the same file again. The directory is recursively removed when the
  +\acl@_smtp@_data\ ACL has finished running. When the MIME ACL decodes files,
  +they are put into that same directory by default.
  +
  +
  +.section Scanning for viruses
  +.rset SECTscanvirus "~~chapter.~~section"
  +.index virus scanning
  +.index content scanning||for viruses
  +.index content scanning||the \malware\ condition
  +The \malware\ ACL condition lets you connect virus scanner software to Exim. 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.
  +
  +.index \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
  +are needed. The basic syntax is as follows:
  +.display
  +av@_scanner = <<scanner-type>>:<<option1>>:<<option2>>:[...]
  +.endd
  +If you do not set \av@_scanner\, it defaults to
  +.display asis
  +av_scanner = sophie:/var/run/sophie
  +.endd
  +If the value of \av@_scanner\ starts with dollar character, it is expanded
  +before use.
  +
  +The following scanner types are supported in this release:
  +.numberpars $.
  +.index virus scanners||Kaspersky
  +\aveserver\: This is the scanner daemon of Kaspersky Version 5. You can get a
  +trial version at \?http://www.kaspersky.com?\. This scanner type takes one
  +option, which is the path to the daemon's UNIX socket. The default is shown in
  +this example:
  +.display asis
  +av_scanner = aveserver:/var/run/aveserver
  +.endd
  +
  +.nextp
  +.index virus scanners||clamd
  +\clamd\: This daemon-type scanner is GPL and free. You can get it at
  +\?http://www.clamav.net/?\. Clamd does not seem to unpack MIME containers,
  +so it is recommended to use the demime facility with it. It takes one option:
  +either the path and name of a UNIX socket file, or a hostname or IP number, and
  +a port, separated by space, as in the second of these examples:
  +.display asis
  +av_scanner = clamd:/opt/clamd/socket
  +av_scanner = clamd:192.168.2.100 1234
  +.endd
  +If the option is unset, the default is \(/tmp/clamd)\.
  +
  +.nextp
  +.index virus scanners||command line interface
  +\cmdline\: This is the keyword for the generic command line scanner interface.
  +It can be used to attach virus scanners that are invoked from the shell. This
  +scanner type takes 3 mantadory options:
  +.numberpars
  +The full path and name of the scanner binary, with all command line options,
  +and a placeholder (%s) for the directory to scan.
  +.nextp
  +A regular expression to match against the STDOUT and STDERR output of the virus
  +scanner. If the expression matches, a virus was found. You must make absolutely
  +sure that this expression matches on `virus found'. This is called the
  +`trigger' expression.
  +.nextp
  +Another regular expression, containing exactly one pair of braces, to match the
  +name of the virus found in the scanners output. This is called the `name'
  +expression.
  +.endp
  +For example, Sophos Sweep reports a virus on a line like this:
  +.display asis
  +Virus 'W32/Magistr-B' found in file ./those.bat
  +.endd
  +For the trigger expression, we can just match the word `found'. For the name
  +expression, we want to extract the W32/Magistr-B string, so we can match for
  +the single quotes left and right of it. Altogether, this makes the
  +configuration setting:
  +.display asis
  +av_scanner = cmdline:\
  +             /path/to/sweep -all -rec -archive %s:\
  +             found:'(.+)'
  +.endd
  +
  +.nextp
  +.index virus scanners||DrWeb
  +\drweb\: The DrWeb daemon scanner (\?http://www.sald.com/?\) interface
  +takes one argument, either a full path to a UNIX socket, or an IP address and
  +port separated by whitespace, as in these examples:
  +.display asis
  +av_scanner = drweb:/var/run/drwebd.sock
  +av_scanner = drweb:192.168.2.20 31337
  +.endd
  +If you omit the argument, the default path \(/usr/local/drweb/run/drwebd.sock)\
  +is used. Thanks to Alex Miller for contributing the code for this scanner.
  +
  +.nextp
  +.index virus scanners||F-Secure
  +\fsecure\: The F-Secure daemon scanner (\?http://www.f-secure.com?\) takes one
  +argument which is the path to a UNIX socket. For example:
  +.display asis
  +av_scanner = fsecure:/path/to/.fsav
  +.endd
  +If no argument is given, the default is \(/var/run/.fsav)\. Thanks to Johan
  +Thelmen for contributing the code for this scanner.
  +
  +.nextp
  +.index virus scanners||Kaspersky
  +\kavdaemon\: This is the scanner daemon of Kaspersky Version 4. This version of
  +the Kaspersky scanner is outdated. Please upgrade (see \aveserver\ above). This
  +scanner type takes one option, which is the path to the daemon's UNIX socket.
  +For example:
  +.display asis
  +av_scanner = kavdaemon:/opt/AVP/AvpCtl
  +.endd
  +The default path is \(/var/run/AvpCtl)\.
  +
  +.nextp
  +.index virus scanners||mksd
  +\mksd\: This is a daemon type scanner that is aimed mainly at Polish users,
  +though some parts of documentation are now available in English. You can get it
  +at \?http://linux.mks.com.pl/?\. The only option for this scanner type is the
  +maximum number of processes used simultaneously to scan the attachments,
  +provided that the demime facility is employed and also provided that mksd has
  +been run with at least the same number of child processes. For example:
  +.display asis
  +av_scanner = mksd:2
  +.endd
  +You can safely omit this option (the default value is 1).
  +
  +.nextp
  +.index virus scanners||Sophos and Sophie
  +\sophie\:  Sophie is a daemon that uses Sophos' \libsavi\ library to scan for
  +viruses. You can get Sophie at \?http://www.vanja.com/tools/sophie/?\. The only
  +option for this scanner type is the path to the UNIX socket that Sophie uses
  +for client communication. For example:
  +.display asis
  +av_scanner = sophie:/tmp/sophie
  +.endd
  +The default path is \(/var/run/sophie)\, so if you are using this, you can omit
  +the option.
  +.endp
  +
  +When \av@_scanner\ is correcly set, you can use the \malware\ condition in the
  +DATA ACL. The condition takes a right-hand argument that is expanded before
  +use. It can then be one of
  +.numberpars $.
  +`true', `*', or `1', in which case the message is scanned for viruses. The
  +condition succeeds if a virus was found, and fail otherwise. This is the
  +recommended usage.
  +.nextp
  +`false' or `0', in which case no scanning is done and the condition fails
  +immediately.
  +.nextp
  +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.
  +.endp
  +You can append \"/defer@_ok"\ to the \malware\ condition to accept messages even
  +if there is a problem with the virus scanner.
  +
  +.index \$malware@_name$\
  +When a virus is found, the condition sets up an expansion variable called
  +\$malware@_name$\ that contains the name of the virus. You can use it in a
  +\message\ modifier that specifies the error returned to the sender, and/or in
  +logging data.
  +
  +The \malware\ condition caches its results, so when you use it multiple times
  +for the same message, the actual scanning process is only carried out once.
  +
  +If your virus scanner cannot unpack MIME and TNEF containers itself, you should
  +use the \demime\ condition (see section ~~SECTdemimecond) before the \malware\
  +condition.
  +
  +Here is a very simple scanning example:
  +.display asis
  +deny message = This message contains malware ($malware_name)
  +   demime = *
  +   malware = *
  +.endd
  +The next example accepts messages when there is a problem with the scanner:
  +.display asis
  +deny message = This message contains malware ($malware_name)
  +   demime = *
  +   malware = */defer_ok
  +.endd
  +The next example shows how to use an ACL variable to scan with both sophie and
  +aveserver. It assumes you have set:
  +.display asis
  +av_scanner = $acl_m0
  +.endd
  +in the main Exim configuration.
  +.display asis
  +deny message = This message contains malware ($malware_name)
  +   set acl_m0 = sophie
  +   malware = *
  +
  +deny message = This message contains malware ($malware_name)
  +   set acl_m0 = aveserver
  +   malware = *
  +.endd
  +However, when \av@_scanner\ is expanded, the caching of the \malware\
  +condition result does not happen, so each \malware\ condition call causes a
  +new scan of the message.
  +
  +
  +.section Scanning with SpamAssassin
  +.rset SECTscanspamass "~~chapter.~~section"
  +.index content scanning||for spam
  +.index spam scanning
  +.index SpamAssassin, scanning with
  +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
  +\?http://www.spamassassin.org?\, or, if you have a working Perl installation,
  +you can use CPAN by running:
  +.display asis
  +perl -MCPAN -e 'install Mail::SpamAssassin'
  +.endd
  +SpamAssassin has its own set of configuration files. Please review its
  +documentation to see how you can tweak it. The default installation should work
  +nicely, however.
  +
  +.index \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):
  +.display asis
  +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:
  +.display asis
  +spamd_address = /var/run/spamd_socket
  +.endd
  +
  +You can have multiple \spamd\ servers to improve scalability. These can reside
  +on other hardware reachable over the network. To specify multiple \spamd\
  +servers, put multiple address/port pairs in the \spamd@_address\ option,
  +separated with colons:
  +.display asis
  +spamd_address = 192.168.2.10 783 : \
  +                192.168.2.11 783 : \
  +                192.168.2.12 783
  +.endd
  +Up to 32 \spamd\ servers are supported. The servers are
  +queried in a random fashion. When a server fails to respond
  +to the connection attempt, all other servers are tried
  +until one succeeds. If no server responds, the \spam\
  +condition defers. 
  +
  +\**Warning**\: It is not possible to use the UNIX socket connection method with
  +multiple \spamd\ servers.
  +
  +Here is a simple example of the use of the \spam\ condition in a DATA ACL:
  +.display asis
  +deny message = This message was classified as SPAM
  +        spam = joe
  +.endd
  +The right-hand side of the \spam\ condition specifies the username that
  +SpamAssassin should scan for. If you do not want to scan for a particular user,
  +but rather use the SpamAssassin system-wide default profile, you can scan for
  +an unknown user, or simply use `nobody'. However, you must put something on the
  +right-hand side.
  +
  +The username allows you to use per-domain or per-user antispam profiles. The
  +right-hand side is expanded before being used, so you can put lookups or
  +conditions there. When the right-hand side evaluates to `0' or `false', no
  +scanning is done and the condition fails immediately.
  +
  +The \spam\ condition returns true if the threshold specified in the user's
  +SpamAssassin profile has been matched or exceeded. If you want to use the
  +\spam\ condition for its side effects (see the variables below), you can make
  +it always return `true' by appending \":true"\ to the username.
  +
  +.index spam scanning||returned variables
  +When the \spam\ condition is run, it sets up the following expansion
  +variables:
  +
  +.push
  +.indent 2em
  +
  +.tempindent 0
  +\$spam@_score$\: The spam score of the message, for example `3.4' or `30.5'.
  +This is useful for inclusion in log or reject messages.
  +
  +.tempindent 0
  +\$spam@_score@_int$\: The spam score of the message, multiplied by ten, as an
  +integer value. For example `34' or `305'. This is useful for numeric
  +comparisons in conditions. This variable is special; it is saved with the
  +message, and written to Exim's spool file. This means that it can be used
  +during the whole life of the message on your Exim system, in particualr, in
  +routers or transports during the later delivery phase.
  +
  +.tempindent 0
  +\$spam@_bar$\: A string consisting of a number of `+' or `@-' characters,
  +representing the integer part of the spam score value. A spam score of 4.4
  +would have a \$spam@_bar$\ value of `++++'. This is useful for inclusion in
  +warning headers, since MUAs can match on such strings.
  +
  +.tempindent 0
  +\$spam@_report$\: A multiline text table, containing the full SpamAssassin
  +report for the message. Useful for inclusion in headers or reject messages.
  +
  +.pop
  +
  +The \spam\ condition caches its results. If you call it again with the same user
  +name, it does not scan again, but rather returns the same values as before.
  +
  +The \spam\ condition returns DEFER if there is any error while running the
  +message through SpamAssassin. If you want to treat DEFER as FAIL (to pass on to
  +the next ACL statement block), append \"/defer@_ok"\ to the right-hand side of
  +the spam condition, like this:
  +.display asis
  +deny message = This message was classified as SPAM
  +     spam    = joe/defer_ok
  +.endd
  +This causes messages to be accepted even if there is a
  +problem with \spamd\.
  +
  +Here is a longer, commented example of the use of the \spam\
  +condition:
  +.display asis
  +# put headers in all messages (no matter if spam or not)
  +warn  message = X-Spam-Score: $spam_score ($spam_bar)
  +      spam = nobody:true
  +warn  message = X-Spam-Report: $spam_report
  +      spam = nobody:true
  +
  +# add second subject line with *SPAM* marker when message
  +# is over threshold
  +warn  message = Subject: *SPAM* $h_Subject:
  +      spam = nobody
  +
  +# reject spam at high scores (> 12)
  +deny   message = This message scored $spam_score spam points.
  +       spam = nobody:true
  +       condition = ${if >{$spam_score_int}{120}{1}{0}}
  +.endd
  +
  +
  +
  +.section Scanning MIME parts
  +.rset SECTscanmimepart "~~chapter.~~section"
  +.index content scanning||MIME parts
  +.index MIME content scanning
  +.index \acl@_smtp@_mime\
  +The \acl@_smtp@_mime\ global option defines an ACL that is called once for each
  +MIME part of a message, including multipart types, in the sequence of their
  +position in the message.
  + 
  +This ACL is called (possibly many times) just before the \acl@_smtp@_data\ ACL,
  +but only if the message has a ::MIME-Version:: header. When a call to the MIME
  +ACL does not yield `accept', ACL processing is aborted and the appropriate
  +result code is sent to the remote client. The \acl@_smtp@_data\ ACL is not
  +called in this circumstance.
  +
  +At the start of the MIME ACL, a number of variables are set from the header 
  +information for the relevant MIME part. These are described below. The contents 
  +of the MIME part are not by default decoded into a disk file except for MIME 
  +parts whose content-type is `message/rfc822'. If you want to decode a MIME part 
  +into a disk file, you can use the \decode\ modifier. The general syntax is:
  +.display
  +decode = [/<<path>>/]<<filename>>
  +.endd
  +The right hand side is expanded before use. After expansion,
  +the value can be:
  +.numberpars
  +`0' or `false', in which case no decoding is done.
  +.nextp
  +The string `default'. In that case, the file is put in the temporary `default'
  +directory \(<<spool@_directory>>/scan/<<message@_id>>/)\ with a sequential file
  +name consisting of the message id and a sequence number. The full path and name
  +is available in \$mime@_decoded@_filename$\ after decoding.
  +.nextp
  +A full path name starting with a slash. If the full name is an existing
  +directory, it is used as a replacement for the default directory. The filename
  +is then sequentially assigned. If the path does not exist, it is used as
  +the full path and file name.
  +.nextp
  +If the string does not start with a slash, it is used as the
  +filename, and the default path is then used.
  +.endp
  +You can easily decode a file with its original, proposed
  +filename using
  +.display asis
  +decode = $mime_filename
  +.endd
  +However, you should keep in mind that \$mime@_filename$\ might contain
  +anything. If you place files outside of the default path, they are not
  +automatically unlinked.
  +
  +For RFC822 attachments (these are messages attached to messages, with a
  +content-type of `message/rfc822'), the ACL is called again in the same manner
  +as for the primary message, only that the \$mime@_is@_rfc822$\ expansion
  +variable is set (see below). Attached messages are always decoded to disk
  +before being checked, and the files are unlinked once the check is done.
  +
  +The MIME ACL supports the \regex\ and \mime@_regex\ conditions. These can be
  +used to match regular expressions against raw and decoded MIME parts,
  +respectively. They are described in section ~~SECTscanregex.
  +
  +.index MIME content scanning||returned variables
  +The following list describes all expansion variables that are
  +available in the MIME ACL:
  +
  +.push
  +.indent 2em
  +
  +.tempindent 0
  +\$mime@_boundary$\:
  +If the current part is a multipart (see \$mime@_is@_multipart$\) below, it
  +should have a boundary string, which is stored in this variable. If the current
  +part has no boundary parameter in the ::Content-Type:: header, this variable
  +contains the empty string.
  +
  +.tempindent 0
  +\$mime@_charset$\:
  +This variable contains the character set identifier, if one was found in the
  +::Content-Type:: header. Examples for charset identifiers are:
  +.display asis
  +us-ascii
  +gb2312 (Chinese)
  +iso-8859-1
   .endd
  -work as expected, with both local parts causing verification failure. When a
  -redirection generates more than one address, the behaviour is more like a
  -mailing list, where the existence of the alias itself is sufficient for
  -verification to succeed.
  +Please note that this value is not normalized, so you should do matches
  +case-insensitively.


+.tempindent 0
+\$mime@_content@_description$\:
+This variable contains the normalized content of the ::Content-Description::
+header. It can contain a human-readable description of the parts content. Some
+implementations repeat the filename for attachments here, but they are
+usually only used for display purposes.

-.section Using an ACL to control relaying
-.rset SECTrelaycontrol "~~chapter.~~section"
-.index ~~ACL||relay control
-.index relaying||control by ACL
-.index policy control||relay control
-An MTA is said to \*relay*\ a message if it receives it from some host and
-delivers it directly to another host as a result of a remote address contained
-within it. Redirecting a local address via an alias or forward file and then
-passing the message on to another host is not relaying,
-.index `percent hack'
-but a redirection as a result of the `percent hack' is.
+.tempindent 0
+\$mime@_content@_disposition$\:
+This variable contains the normalized content of the ::Content-Disposition::
+header. You can expect strings like `attachment' or `inline' here.

  -Two kinds of relaying exist, which are termed `incoming' and `outgoing'. A host
  -which is acting as a gateway or an MX backup is concerned with incoming
  -relaying from arbitrary hosts to a specific set of domains. On the other hand,
  -a host which is acting as a smart host for a number of clients is concerned
  -with outgoing relaying from those clients to the Internet at large. Often the
  -same host is fulfilling both functions, as illustrated in the diagram below,
  -but in principle these two kinds of relaying are entirely independent. What is
  -not wanted is the transmission of mail from arbitrary remote hosts through your
  -system to arbitrary domains.
  -.if ~~sys.fancy
  -.figure "Controlled relaying" rm
  -.indent 0
  -.call aspic
  -centre ~~sys.linelength;
  -magnify 0.8;
  -boundingbox 30;
  -textdepth 16;
  -    boxwidth 120;
  -    boxdepth 44;
  -A:  box "Arbitrary" "remote hosts";
  -C:  ibox;
  -D:  box "Arbitrary" "domains";
  -    iline down 50 from bottom of C;
  -H:  box width 180 "Local host";
  -    iline down 50;
  -E:  ibox;
  -SH: box "Specific" "hosts";
  -SD: box join right to E "Specific" "domains";
  -    arcarrow clockwise from top of SH to bottom of D plus (-10,-4)
  -      via right of H plus (-20,0);
  -    arcarrow clockwise from bottom of A to top of SD plus (10,4)
  -      via left of H plus (20,0);
  +.tempindent 0
  +\$mime@_content@_id$\:
  +This variable contains the normalized content of the ::Content-ID:: header.
  +This is a unique ID that can be used to reference a part from another part.


  -    ibox join left to right of H "$it{Outgoing}";
  -    goto H;
  -    ibox join right to left of H "$it{Incoming}";
  +.tempindent 0
  +\$mime@_content@_size$\:
  +This variable is set only after the \decode\ modifier (see above) has been
  +successfully run. It contains the size of the decoded part in kilobytes. The
  +size is always rounded up to full kilobytes, so only a completely empty part
  +has a \$mime@_content@_size$\ of zero.


  -L:  line dashed from right of A to top of H plus (-15,0);
  -    arc dashed to top of H plus (15,0);
  -    arrow dashed to left of D plus (-2,0);
  +.tempindent 0
  +\$mime@_content@_transfer@_encoding$\:
  +This variable contains the normalized content of the
  +::Content-transfer-encoding:: header. This is a symbolic name for an encoding
  +type. Typical values are `base64' and `quoted-printable'.


  -    arrow dashed back up 72 right 32 from middle of L plus (8,0);
  -    text at end plus (0, 4) "$it{Not wanted}";
  -.endcall
  -.endfigure
  -.elif !~~html
  +.tempindent 0
  +\$mime@_content@_type$\: If the MIME part has a ::Content-Type:: header, this
  +variable contains its value, lowercased, and without any options (like `name'
  +or `charset'). Here are some examples of popular MIME types, as they may appear
  +in this variable:
   .display asis
  -   --------------    -----------
  -   | Arbitrary  |    |Arbitrary|
  -   |remote hosts|    | domains |
  -   --------------    -----------
  - I       v                ^       O
  - n       v                ^       u
  - c    ---v----------------^---    t
  - o    |  v     Local      ^  |    g
  - m    |  v      host      ^  |    o
  - i    ---v----------------^---    i
  - n       v                ^       n
  - g       v                ^       g
  -      Specific         Specific
  -      domains           hosts
  +text/plain
  +text/html
  +application/octet-stream
  +image/jpeg
  +audio/midi
   .endd
  -.else
  -[(IMG SRC="relaying.gif" alt="Controlled relaying")][(br)]
  -.fi
  +If the MIME part has no ::Content-Type:: header, this variable contains the
  +empty string.


-You can implement relay control by means of suitable statements in the ACL that
-runs for each \\RCPT\\ command. For convenience, it is often easiest to use
-Exim's named list facility to define the domains and hosts involved. For
-example, suppose you want to do the following:
-.numberpars $.
-Deliver a number of domains to mailboxes on the local host (or process them
-locally in some other way). Let's say these are \*my.dom1.example*\ and
-\*my.dom2.example*\.
+.tempindent 0
+\$mime@_decoded@_filename$\:
+This variable is set only after the \decode\ modifier (see above) has been
+successfully run. It contains the full path and file name of the file
+containing the decoded data.
+
+.tempindent 0
+\$mime@_filename$\: This is perhaps the most important of the MIME variables.
+It contains a proposed filename for an attachment, if one was found in either
+the ::Content-Type:: or ::Content-Disposition:: headers. The filename will be
+RFC2047 decoded, but no additional sanity checks are done. If no filename was
+found, this variable contains the empty string.
+
+.tempindent 0
+\$mime@_is@_coverletter$\:
+This variable attempts to differentiate the `cover letter' of an e-mail from
+attached data. It can be used to clamp down on flashy or unneccessarily encoded
+content in the cover letter, while not restricting attachments at all.
+
+The variable contains 1 (true) for a MIME part believed to be part of the
+cover letter, and 0 (false) for an attachment. At present, the algorithm is as
+follows:
+.numberpars
+The outermost MIME part of a message always a cover letter.
.nextp
-Relay mail for a number of other domains for which you are the secondary MX.
-These might be \*friend1.example*\ and \*friend2.example*\.
+If a multipart/alternative or multipart/related MIME part is a cover letter, so
+are all MIME subparts within that multipart.
.nextp
-Relay mail from the hosts on your local LAN, to whatever domains are involved.
-Suppose your LAN is 192.168.45.0/24.
+If any other multipart is a cover letter, the first subpart is a cover letter,
+and the rest are attachments.
+.nextp
+All parts contained within an attachment multipart are attachments.
.endp
-In the main part of the configuration, you put the following definitions:
-.display asis
-domainlist local_domains = my.dom1.example : my.dom2.example
-domainlist relay_domains = friend1.example : friend2.example
-hostlist relay_hosts = 192.168.45.0/24
-.endd
-Now you can use these definitions in the ACL that is run for every \\RCPT\\
-command:
+
+As an example, the following will ban `HTML mail' (including that sent with
+alternative plain text), while allowing HTML files to be attached:
.display asis
-acl_check_rcpt:
- accept domains = +local_domains : +relay_domains
- accept hosts = +relay_hosts
+deny message = HTML mail is not accepted here
+ condition = $mime_is_coverletter
+ condition = ${if eq{$mime_content_type}{text/html}{1}{0}}
.endd
-The first statement accepts any \\RCPT\\ command that contains an address in
-the local or relay domains. For any other domain, control passes to the second
-statement, which accepts the command only if it comes from one of the relay
-hosts. In practice, you will probably want to make your ACL more sophisticated
-than this, for example, by including sender and recipient verification. The
-default configuration includes a more comprehensive example, which is described
-in chapter ~~CHAPdefconfil.

+.tempindent 0
+\$mime@_is@_multipart$\:
+This variable has the value 1 (true) when the current part has the main type
+`multipart', for example `multipart/alternative' or `multipart/mixed'. Since
+multipart entities only serve as containers for other parts, you may not want
+to carry out specific actions on them.

-.section Checking a relay configuration
-.rset SECTcheralcon "~~chapter.~~section"
-.index relaying||checking control of
-You can check the relay characteristics of your configuration in the same way
-that you can test any ACL behaviour for an incoming SMTP connection, by using
-the \-bh-\ option to run a fake SMTP session with which you interact.
+.tempindent 0
+\$mime@_is@_rfc822$\:
+This variable has the value 1 (true) if the current part is not a part of the
+checked message itself, but part of an attached message. Attached message
+decoding is fully recursive.

  -For specifically testing for unwanted relaying, the host
  -\*relay-test.mail-abuse.org*\ provides a useful service. If you telnet to this 
  -host from the host on which Exim is running, using the normal telnet port, you 
  -will see a normal telnet connection message and then quite a long delay. Be 
  -patient. The remote host is making an SMTP connection back to your host, and 
  -trying a number of common probes to test for open relay vulnerability. The 
  -results of the tests will eventually appear on your terminal.
  +.tempindent 0
  +\$mime@_part@_count$\:
  +This variable is a counter that is raised for each processed MIME part. It
  +starts at zero for the very first part (which is usually a multipart). The
  +counter is per-message, so it is reset when processing RFC822 attachments (see
  +\$mime@_is@_rfc822$\). The counter stays set after \acl@_smtp@_mime\ is
  +complete, so you can use it in the DATA ACL to determine the number of MIME
  +parts of a message. For non-MIME messages, this variable contains the value -1.
  +
  +.pop
  +
  +
  +
  +
  +.section Scanning with regular expressions
  +.rset SECTscanregex "~~chapter.~~section"
  +.index content scanning||with regular expressions
  +.index regular expressions||content scanning with
  +You can specify your own custom regular expression matches on the full body of 
  +the message, or on individual MIME parts.
  +
  +The \regex\ condition takes one or more regular expressions as arguments and
  +matches them against the full message (when called in the DATA ACL) or a raw
  +MIME part (when called in the MIME ACL). The \regex\ condition matches
  +linewise, with a maximum line length of 32K characters. That means you cannot
  +have multiline matches with the \regex\ condition.
  +
  +The \mime@_regex\ condition can be called only in the MIME ACL. It matches up
  +to 32K of decoded content (the whole content at once, not linewise). If the
  +part has not been decoded with the \decode\ modifier earlier in the ACL, it is
  +decoded automatically when \mime@_regex\ is executed (using default path and
  +filename values). If the decoded data is larger than  32K, only the first 32K
  +characters are checked.
  +
  +The regular expressions are passed as a colon-separated list. To include a
  +literal colon, you must double it. Since the whole right-hand side string is
  +expanded before being used, you must also escape dollar signs and backslashes
  +with more backslashes, or use the \"@\N"\ facility to disable expansion.
  +Here is a simple example that contains two regular expressions:
  +.display asis
  +deny message = contains blacklisted regex ($regex_match_string)
  +       regex = [Mm]ortgage : URGENT BUSINESS PROPOSAL
  +.endd
  +The conditions returns true if any one of the regular expressions matches. The
  +\$regex@_match@_string$\ expansion variable is then set up and contains the
  +matching regular expression.
  +
  +\**Warning**\: With large messages, these conditions can be fairly
  +CPU-intensive.
  +
  +
  +
  +.section The demime condition
  +.rset SECTdemimecond "~~chapter.~~section"
  +.index content scanning||MIME checking
  +.index MIME content scanning
  +The \demime\ ACL condition provides MIME unpacking, sanity checking and file
  +extension blocking. It uses a simpler interface to MIME decoding than the MIME
  +ACL functionality, but provides no additional facilities. It is kept in exiscan
  +for backward compatibility.
  +
  +The \demime\ condition unpacks MIME containers in the message. It detects
  +errors in MIME containers and can match file extensions found in the message
  +against a list. Using this facility produces files containing the unpacked MIME
  +parts of the message in the temporary scan directory. If you do antivirus
  +scanning, it is recommened that you use the \demime\ condition before the
  +antivirus (\malware\) condition.
  +
  +On the right-hand side of the \demime\ condition you can pass a colon-separated
  +list of file extensions that it should match against. For example:
  +.display asis
  +deny message = Found blacklisted file attachment
  +     demime  = vbs:com:bat:pif:prf:lnk
  +.endd
  +If one of the file extensions is found, the condition is true, otherwise it is
  +false. If there is a temporary error while demimeing (for example, `disk
  +full'), the condition defers, and the message is temporarily rejected (unless
  +the condition is on a \warn\ verb).
  +
  +The right-hand side is expanded before being treated as a list, so you can have
  +conditions and lookups there. If it expands to an empty string, `false', or
  +zero (`0'), no demimeing is done and the condition is false.
  +
  +The \demime\ condition set the following variables:
  +
  +.push
  +.indent 2em
  +
  +.tempindent 0
  +\$demime@_errorlevel$\: When an error is detected in a MIME container, this
  +variable contains the severity of the error, as an integer number. The higher
  +the value, the more severe the error. If this variable is unset or zero, no
  +error occurred.
  +
  +.tempindent 0
  +\$demime@_reason$\: When \$demime@_errorlevel$\ is greater than zero, this
  +variable contains a human-readable text string describing the MIME error that
  +occurred.
  +
  +.tempindent 0
  +\$found@_extension$\: When the \demime\ condition is true, this variable
  +contains the file extension it found.
  + 
  +.pop 
  + 
  +Both \$demime@_errorlevel$\ and \$demime@_reason$\ are set by the first call of
  +the \demime\ condition, and are not changed on subsequent calls.


  +If you do not want to check for file extensions, but rather use the \demime\
  +condition for unpacking or error checking purposes, pass `*' as the
  +right-hand side value. Here is a more elaborate example of how to use this
  +facility:
  +.display asis
  +# Reject messages with serious MIME container errors
  +deny  message = Found MIME error ($demime_reason).
  +      demime = *
  +      condition = ${if >{$demime_errorlevel}{2}{1}{0}}
  +
  +# Reject known virus spreading file extensions.
  +# Accepting these is pretty much braindead.
  +deny  message = contains $found_extension file (blacklisted).
  +      demime  = com:vbs:bat:pif:scr
  +
  +# Freeze .exe and .doc files. Postmaster can
  +# examine them and eventually thaw them.
  +deny  log_message = Another $found_extension file.
  +      demime = exe:doc
  +      control = freeze
  +.endd
  +
  +
  +.nem




@@ -22471,11 +23524,11 @@
want to apply a lot of checking to messages before accepting them. You can do a
certain amount through string expansions and the \condition\ condition in the
ACL that runs after the SMTP \\DATA\\ command or the ACL for non-SMTP messages
-(see chapter ~~CHAPACL), but this has its limitations.
+(see chapter ~~CHAPACL), but this has its limitations.

.index \exiscan\
-An increasingly popular way of doing additional checking is to make use of the
-Exiscan patch for Exim, which adds ACL conditions that perform body scans of
+An increasingly popular way of doing additional checking is to make use of the
+Exiscan patch for Exim, which adds ACL conditions that perform body scans of
various kinds. This is available from
.if ~~html
[(A HREF="http://duncanthrax.net/exiscan-acl/")]
@@ -22490,14 +23543,14 @@
scanning function, written in C. If you want to run code that is written in
something other than C, you can of course use a little C stub to call it.

-The local scan function is run once for every incoming message, at the point
+The local scan function is run once for every incoming message, at the point
when Exim is just about to accept the message.
It can therefore be used to control non-SMTP messages from local processes as
well as messages arriving via SMTP.

Exim applies a timeout to calls of the local scan function, and there is an
option called \local@_scan@_timeout\ for setting it. The default is 5 minutes.
-Zero means `no timeout'.
+Zero means `no timeout'.
Exim also sets up signal handlers for SIGSEGV, SIGILL, SIGFPE, and SIGBUS
before calling the local scan function, so that the most common types of crash
are caught. If the timeout is exceeded or one of those signals is caught, the
@@ -22522,7 +23575,7 @@
commented template function (that just accepts the message) in the file
\(src/local@_scan.c)\.

-If you want to make use of Exim's run time configuration file to set options
+If you want to make use of Exim's run time configuration file to set options
for your \*local@_scan()*\ function, you must also set
.display asis
LOCAL_SCAN_HAS_OPTIONS=yes
@@ -22541,8 +23594,8 @@
This header file defines a number of variables and other values, and the
prototype for the function itself. Exim is coded to use unsigned char values
almost exclusively, and one of the things this header defines is a shorthand
-for \"unsigned char"\ called \"uschar"\.
-It also contains the following macro definitions, to simplify casting character
+for \"unsigned char"\ called \"uschar"\.
+It also contains the following macro definitions, to simplify casting character
strings and pointers to character strings:
.display asis
#define CS (char *)
@@ -22560,7 +23613,7 @@
The arguments are as follows:
.numberpars $.
\fd\ is a file descriptor for the file that contains the body of the message
-(the -D file).
+(the -D file).
The file is open for reading and writing, but updating it is not recommended.
\**Warning**\: You must \*not*\ close this file descriptor.

@@ -22585,12 +23638,12 @@
.nextp
\"LOCAL@_SCAN@_ACCEPT@_FREEZE"\

-This behaves as \\LOCAL@_SCAN@_ACCEPT\\, except that the accepted message is
+This behaves as \\LOCAL@_SCAN@_ACCEPT\\, except that the accepted message is
queued without immediate delivery, and is frozen.
.nextp
\"LOCAL@_SCAN@_ACCEPT@_QUEUE"\

-This behaves as \\LOCAL@_SCAN@_ACCEPT\\, except that the accepted message is
+This behaves as \\LOCAL@_SCAN@_ACCEPT\\, except that the accepted message is
queued without immediate delivery.
.nextp
\"LOCAL@_SCAN@_REJECT"\
@@ -22639,7 +23692,7 @@
in your \(Local/Makefile)\ when you build Exim. (This line is in
\(OS/Makefile-Default)\, commented out). Then, in the \*local@_scan()*\ source
file, you must define static variables to hold the option values, and a table to
-define them.
+define them.

The table must be a vector called \local@_scan@_options\, of type
\"optionlist"\. Each entry is a triplet, consisting of a name, an option type,
@@ -22671,7 +23724,7 @@

.item opt@_bool
This specifies a boolean (true/false) option. The address should point to
-a variable of type \"BOOL"\, which will be set to \\TRUE\\ or \\FALSE\\, which
+a variable of type \"BOOL"\, which will be set to \\TRUE\\ or \\FALSE\\, which
are macros that are defined as `1' and `0', respectively. If you want to detect
whether such a variable has been set at all, you can initialize it to
\\TRUE@_UNSET\\. (BOOL variables are integers underneath, so can hold more than
@@ -22683,7 +23736,7 @@
multiplied by 1000, so, for example, 1.4142 is truncated and stored as 1414.

.item "opt@_int"
-This specifies an integer; the address should point to a variable of type
+This specifies an integer; the address should point to a variable of type
\"int"\. The value may be specified in any of the integer formats accepted by
Exim.

  @@ -22736,7 +23789,7 @@
   Thus, to write to the debugging output only when \"+local@_scan"\ has been
   selected, you should use code like this:
   .display asis
  -if ((debug_selector & D_local_scan) != 0) 
  +if ((debug_selector & D_local_scan) != 0)
     debug_printf("xxx", ...);
   .endd


@@ -22755,7 +23808,7 @@
The value of the \headers@_charset\ configuration option.

.item "BOOL host@_checking"
-This variable is TRUE during a host checking session that is initiated by the
+This variable is TRUE during a host checking session that is initiated by the
\-bh-\ command line option.

.item "uschar *interface@_address"
@@ -22766,7 +23819,7 @@
The port on which this message was received.

.item "uschar *message@_id"
-This variable contains the message id for the incoming message as a
+This variable contains the message id for the incoming message as a
zero-terminated string.


@@ -22786,7 +23839,7 @@
the value in \recipients@_count\. In particular, by setting \recipients@_count\
to zero you remove all recipients. If you then return the value
\"LOCAL@_SCAN@_ACCEPT"\, the message is accepted, but immediately blackholed.
-To replace the recipients, set \recipients@_count\ to zero and then call
+To replace the recipients, set \recipients@_count\ to zero and then call
\*receive@_add@_recipient()*\ as often as needed.

.item "uschar *sender@_address"
@@ -22813,7 +23866,7 @@
This variable is TRUE for BSMTP input.

.item "int store@_pool"
-The contents of this variable control which pool of memory is used for new
+The contents of this variable control which pool of memory is used for new
requests. See section ~~SECTmemhanloc for details.

.enditems
@@ -22861,14 +23914,14 @@
.item "int pno"
This is used in later Exim processing when top level addresses are created
by the \one@_time\ option. It is not relevant at the time \*local@_scan()*\ is
-run and
+run and
must always contain -1 at this stage.

.item "uschar *errors@_to"
-If this value is not NULL, bounce messages caused by failing to deliver to the
+If this value is not NULL, bounce messages caused by failing to deliver to the
recipient are sent to the address it contains. In other words, it overrides the
envelope sender for this one recipient. (Compare the \errors@_to\ generic
-router option.)
+router option.)
If a \*local@_scan()*\ function sets an \errors@_to\ field to an unqualified
address, Exim qualifies it using the domain from \qualify@_recipient\.
When \*local@_scan()*\ is called, the \errors@_to\ field is NULL for all
@@ -22886,14 +23939,14 @@

.item "pid@_t child@_open(uschar **argv, uschar **envp, int newumask, int *infdptr, int *outfdptr, BOOL make@_leader)"
This function creates a child process that runs the command specified by
-\argv\. The environment for the process is specified by \envp\, which can be
+\argv\. The environment for the process is specified by \envp\, which can be
NULL if no environment variables are to be passed. A new umask is supplied for
the process in \newumask\.

Pipes to the standard input and output of the new process are set up
and returned to the caller via the \infdptr\ and \outfdptr\ arguments. The
standard error is cloned to the standard output. If there are any file
-descriptors `in the way' in the new process, they are closed. If the final
+descriptors `in the way' in the new process, they are closed. If the final
argument is TRUE, the new process is made into a process group leader.

The function returns the pid of the new process, or -1 if things go wrong.
@@ -22935,7 +23988,7 @@
and returns to you (via the \"int *"\ argument) a file descriptor for the pipe
that is connected to the standard input. The yield of the function is the PID
of the subprocess. You can then write a message to the file descriptor, with
-recipients in ::To::, ::Cc::, and/or ::Bcc:: header lines.
+recipients in ::To::, ::Cc::, and/or ::Bcc:: header lines.

When you have finished, call \*child@_close()*\ to wait for the process to
finish and to collect its ending status. A timeout value of zero is usually
@@ -22943,20 +23996,20 @@
addresses, you should get a return code of zero.

   .item "void debug@_printf(char *, ...)"
  -This is Exim's debugging function, with arguments as for \*(printf()*\. The 
  +This is Exim's debugging function, with arguments as for \*(printf()*\. The
   output is written to the standard error stream. If no debugging is selected,
  -calls to \*debug@_printf()*\ have no effect. Normally, you should make calls 
  +calls to \*debug@_printf()*\ have no effect. Normally, you should make calls
   conditional on the \"local@_scan"\ debug selector by coding like this:
   .display asis
  -if ((debug_selector & D_local_scan) != 0) 
  +if ((debug_selector & D_local_scan) != 0)
     debug_printf("xxx", ...);
   .endd


.item "uschar *expand@_string(uschar *string)"
This is an interface to Exim's string expansion code. The return value is the
expanded string, or NULL if there was an expansion failure.
-The C variable \expand@_string@_message\ contains an error message after an
-expansion failure. If expansion does not change the string, the return value is
+The C variable \expand@_string@_message\ contains an error message after an
+expansion failure. If expansion does not change the string, the return value is
the pointer to the input string. Otherwise, the return value points to a new
block of memory that was obtained by a call to \*store@_get()*\. See section
~~SECTmemhanloc below for a discussion of memory handling.
@@ -22997,7 +24050,7 @@

.item "int lss@_match@_local@_part(uschar *localpart, uschar *list, BOOL caseless)"
This function checks for a match in a local part list. The third argument
-controls case-sensitivity. The return values are as for
+controls case-sensitivity. The return values are as for
\*lss@_match@_domain()*\.

.item "int lss@_match@_address(uschar *address, uschar *list, BOOL caseless)"
@@ -23021,7 +24074,7 @@
.item "void log@_write(unsigned int selector, int which, char *format, ...)"
This function writes to Exim's log files. The first argument should be zero (it
is concerned with \log@_selector\). The second argument can be \"LOG@_MAIN"\ or
-\"LOG@_REJECT"\ or
+\"LOG@_REJECT"\ or
\"LOG@_PANIC"\ or the inclusive `or' of any combination of them. It specifies
to which log or logs the message is written.
The remaining arguments are a format and relevant insertion arguments. The
@@ -23033,13 +24086,13 @@
is the recipient address. If it is unqualified (has no domain), it is qualified
with the \qualify@_recipient\ domain. The second argument must always be -1.

  -This function does not allow you to specify a private \errors@_to\ address (as 
  -described with the structure of \recipient@_item\ above), because it pre-dates 
  -the addition of that field to the structure. However, it is easy to add such a 
  +This function does not allow you to specify a private \errors@_to\ address (as
  +described with the structure of \recipient@_item\ above), because it pre-dates
  +the addition of that field to the structure. However, it is easy to add such a
   value afterwards. For example:
   .display asis
   receive_add_recipient(US"monitor@???", -1);
  -recipients_list[recipients_count-1].errors_to = 
  +recipients_list[recipients_count-1].errors_to =
     US"postmaster@???";
   .endd


@@ -23051,10 +24104,10 @@
made to translate the result to the named character set. If this fails, the
binary string is returned with an error message.

  -The first argument is the string to be decoded. If \lencheck\ is TRUE, the 
  -maximum MIME word length is enforced. The third argument is the target 
  +The first argument is the string to be decoded. If \lencheck\ is TRUE, the
  +maximum MIME word length is enforced. The third argument is the target
   encoding, or NULL if no translation is wanted.
  -                
  +
   .index binary zero||in RFC 2047 decoding
   If a binary zero is encountered in the decoded string, it is replaced by the
   contents of the \zeroval\ argument. For use with Exim headers, the value must
  @@ -23064,15 +24117,15 @@
   \lenptr\ is not NULL, the length of the result is set in the variable to which
   it points. When \zeroval\ is 0, \lenptr\ should not be NULL.


-If an error is encountered, the function returns NULL and uses the \error\
-argument to return an error message. The variable pointed to by \error\ is set
-to NULL if there is no error; it may be set non-NULL even when the function
-returns a non-NULL value if decoding was successful, but there was a problem
+If an error is encountered, the function returns NULL and uses the \error\
+argument to return an error message. The variable pointed to by \error\ is set
+to NULL if there is no error; it may be set non-NULL even when the function
+returns a non-NULL value if decoding was successful, but there was a problem
with translation.


.item "int smtp@_fflush(void)"
-This function is used in conjunction with \*smtp@_printf()*\, as described
+This function is used in conjunction with \*smtp@_printf()*\, as described
below.

.item "void smtp@_printf(char *, ...)"
@@ -23119,7 +24172,7 @@
runs out of memory. See the next section for a discussion of memory handling.

.item "void *store@_get@_perm(int)"
-This function is like \*store@_get()*\, but it always gets memory from the
+This function is like \*store@_get()*\, but it always gets memory from the
permanent pool. See the next section for a discussion of memory handling.

.item "uschar *string@_copy(uschar *string)"
@@ -23139,10 +24192,10 @@
.section More about Exim's memory handling
.rset SECTmemhanloc "~~chapter.~~section"
.index \*local@_scan()*\ function||memory handling
-No function is provided for freeing memory, because that is never needed.
+No function is provided for freeing memory, because that is never needed.
The dynamic memory that Exim uses when receiving a message is automatically
-recycled if another message is received by the same process (this applies only
-to incoming SMTP connections -- other input methods can supply only one message
+recycled if another message is received by the same process (this applies only
+to incoming SMTP connections -- other input methods can supply only one message
at a time). After receiving the last message, a reception process terminates.

Because it is recycled, the normal dynamic memory cannot be used for holding
@@ -23150,13 +24203,13 @@
connection. However, Exim in fact uses two pools of dynamic memory; the second
one is not recycled, and can be used for this purpose.

-If you want to allocate memory that remains available for subsequent messages
+If you want to allocate memory that remains available for subsequent messages
in the same SMTP connection, you should set
.display asis
store_pool = POOL_PERM
.endd
-before calling the function that does the allocation. There is no need to
-restore the value if you do not need to; however, if you do want to revert to
+before calling the function that does the allocation. There is no need to
+restore the value if you do not need to; however, if you do want to revert to
the normal pool, you can either restore the previous value of \store@_pool\ or
set it explicitly to \\POOL@_MAIN\\.

@@ -23187,8 +24240,8 @@
they are delivered. This is called the $it{system filter}.

The system filter operates in a similar manner to users' filter files, but it
-is run just once per message (however many recipients the message has).
-It should not normally be used as a substitute for routing, because \deliver\
+is run just once per message (however many recipients the message has).
+It should not normally be used as a substitute for routing, because \deliver\
commands in a system router provide new envelope recipient addresses.
The system filter must be an Exim filter. It cannot be a Sieve filter.

@@ -23196,7 +24249,7 @@
is done. If a message fails to be completely delivered at the first attempt,
the system filter is run again at the start of every retry.
If you want your filter to do something only once per message, you can make use
-of the \first@_delivery\ condition in an \if\ command in the filter to prevent
+of the \first@_delivery\ condition in an \if\ command in the filter to prevent
it happening on retries.

\**Warning**\: Because the system filter runs just once, variables that are
@@ -23248,7 +24301,7 @@
\**Warning**\: If a system filter uses the \first@_delivery\ condition to
specify an `unseen' (non-significant) delivery, and that delivery does not
succeed, it will not be tried again.
-If you want Exim to retry an unseen delivery until it succeeds, you should
+If you want Exim to retry an unseen delivery until it succeeds, you should
arrange to set it up every time the filter runs.

When a system filter finishes running, the values of the variables \$n0$\ --
@@ -23272,16 +24325,16 @@
.index \defer\ in system filter
There are three extra commands (\defer\, \freeze\ and \fail\) which are always
available in system filters, but are not normally enabled in users' filters.
-(See the \allow@_defer\,
+(See the \allow@_defer\,
\allow@_freeze\ and \allow@_fail\ options for the \%redirect%\ router.) These
commands can optionally be followed by the word \text\ and a string containing
an error message, for example:
.display asis
fail text "this message looks like spam to me"
.endd
-The keyword \text\ is optional if the next character is a double quote.
+The keyword \text\ is optional if the next character is a double quote.

-The \defer\ command defers delivery of the original recipients of the message.
+The \defer\ command defers delivery of the original recipients of the message.
The \fail\ command causes all the original recipients to be failed, and a
bounce message to be created. The \freeze\ command suspends all delivery
attempts for the original recipients. In all cases, any new deliveries that are
@@ -23322,15 +24375,15 @@
alternative is clever checking of the body and/or headers to detect bounces
generated by the filter.

-The interpretation of a system filter file ceases after a
-\defer\,
+The interpretation of a system filter file ceases after a
+\defer\,
\freeze\, or \fail\ command is obeyed. However, any deliveries that were set up
earlier in the filter file are honoured, so you can use a sequence such as
.display asis
mail ...
freeze
.endd
-to send a specified message when the system filter is freezing (or deferring or
+to send a specified message when the system filter is freezing (or deferring or
failing) a message. The normal deliveries for the message do not, of course,
take place.

@@ -23351,11 +24404,10 @@
fail, the command has no effect.

If the message is not delivered at the first attempt, header lines that were
-added by the system filter are stored with the message, and so are still
+added by the system filter are stored with the message, and so are still
present at the next delivery attempt. For that reason, it is usual to make the
\headers add\ command conditional on \first@_delivery\.

  -.em
   You can use `@\n' within the string, followed by white space, to specify
   continued header lines. More than one header may be added in one command by
   including `@\n' within the string without any following white space. For
  @@ -23366,12 +24418,11 @@
                X-header-2: ...."
   .endd
   Note that the header line continuation white space after the first newline must
  -be placed before the backslash that continues the input string, because white 
  +be placed before the backslash that continues the input string, because white
   space after input continuations is ignored.


Header lines that are added by a system filter are visible to users' filter
-files and to all routers and transports.
-.nem
+files and to all routers and transports.

   The argument for \headers remove\ is a colon-separated list of header names.
   This command applies only to those headers that are stored with the message;
  @@ -23408,10 +24459,8 @@
   .display asis
   central_filter:
   .newline
  -.em
     check_local_user
   .newline
  -.nem   
     driver = redirect
     domains = +local_domains
     file = /central/filters/$local_part
  @@ -23419,12 +24468,10 @@
     allow_filter
     allow_freeze
   .endd
  -.em
   The filter is run in a separate process under its own uid. Therefore, either
  -\check@_local@_user\ must be set (as above), in which case the filter is run as 
  -the local user, or the \user\ option must be used to specify which user to use. 
  +\check@_local@_user\ must be set (as above), in which case the filter is run as
  +the local user, or the \user\ option must be used to specify which user to use.
   If both are set, \user\ overrides.
  -.nem


Care should be taken to ensure that none of the commands in the filter file
specify a significant delivery if the message is to go on to be delivered to
@@ -23450,8 +24497,8 @@
the code of Exim, but it is possible to change it, either by adding a single
string, or by replacing each of the paragraphs by text supplied in a file.

-The ::From:: and ::To:: header lines are automatically generated; you can cause
-a ::Reply-To:: line to be added by setting the \errors@_reply@_to\ option. Exim
+The ::From:: and ::To:: header lines are automatically generated; you can cause
+a ::Reply-To:: line to be added by setting the \errors@_reply@_to\ option. Exim
also adds the line
.display asis
Auto-Submitted: auto-generated
@@ -23539,8 +24586,8 @@
.rset SECTcustwarn "~~chapter.~~section"
.index customizing||warning message
.index warning of delay||customizing the message
-The option
-\warn@_message@_file\
+The option
+\warn@_message@_file\
can be pointed at a template file for use when
warnings about message delays are created. In this case there are only three
text sections:
@@ -23553,7 +24600,7 @@
.nextp
The third item then ends the message.
.endp
-The default state is equivalent to the following file, except that the line
+The default state is equivalent to the following file, except that the line
starting `A message' has been split here, in order to fit it on the page:

----------------------------------------------
Diff block truncated. (Max lines = 10000)
----------------------------------------------