Testsute: output changes resulting

[exim.git] / doc / doc-docbook / spec.xfpt

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 935a78a39d2252b6fb9a61b499bf763575e6fb19..1f5e295119726d9d868533f8a335e850e3bd75c6 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -1,3 +1,4 @@
+

 . /////////////////////////////////////////////////////////////////////////////
 . This is the primary source of the Exim Manual. It is an xfpt document that is
 . converted into DocBook XML for subsequent conversion into printable and online
 . /////////////////////////////////////////////////////////////////////////////
 . This is the primary source of the Exim Manual. It is an xfpt document that is
 . converted into DocBook XML for subsequent conversion into printable and online


@@ -76,6 +77,16 @@
 . --- table with four columns. For cases when the option name is given with
 . --- a space, so that it can be split, a fifth argument is used for the
 . --- index entry.
 . --- table with four columns. For cases when the option name is given with
 . --- a space, so that it can be split, a fifth argument is used for the
 . --- index entry.

+. --- Also one for multiple option def headings be grouped in a single
+. --- table (but without the split capability).
+
+.macro otable
+.itable all 0 0 4 8* left 6* center 6* center 6* right
+.endmacro
+
+.macro orow
+.row "&%$1%&" "Use: &'$2'&" "Type: &'$3'&" "Default: &'$4'&"
+.endmacro

 
 .macro option
 .arg 5
 
 .macro option
 .arg 5


@@ -84,8 +95,19 @@
 .arg -5
 .oindex "&%$1%&"
 .endarg
 .arg -5
 .oindex "&%$1%&"
 .endarg

-.itable all 0 0 4 8* left 6* center 6* center 6* right
-.row "&%$1%&" "Use: &'$2'&" "Type: &'$3'&" "Default: &'$4'&"
+.otable
+.orow "$1" "$2" "$3" "$4"
+.endtable
+.endmacro
+
+.macro options
+.eacharg
+.oindex "&%$+1%&"
+.endeach 4
+.otable
+.eacharg
+.orow "$+1" "$+2" "$+3" "$+4"
+.endeach 4

 .endtable
 .endmacro
 
 .endtable
 .endmacro
 


@@ -98,20 +120,33 @@
 .endmacro
 
 
 .endmacro
 
 

+. --- A macro for a plain variable, including the .vitem and .vindex
+.macro var
+.vitem $1
+.vindex $1
+.endmacro
+

 . --- A macro for a "tainted" marker, done as a one-element table
 .macro tmark
 .itable none 0 0 1 10pt left
 .row &'Tainted'&
 .endtable
 .endmacro
 . --- A macro for a "tainted" marker, done as a one-element table
 .macro tmark
 .itable none 0 0 1 10pt left
 .row &'Tainted'&
 .endtable
 .endmacro

+

 . --- A macro for a tainted variable, adding a taint-marker
 . --- A macro for a tainted variable, adding a taint-marker

-. --- and including the .vitem and .vindex

 .macro tvar
 .macro tvar

-.vitem $1
-.vindex $1
+.var $1

 .tmark
 .endmacro
 
 .tmark
 .endmacro
 

+. --- A macro for a cmdline option, including a .oindex
+. --- 1st arg is the option name, undecorated (we do that here).
+. --- 2nd arg, optional, text (decorated as needed) to be appended to the name
+.macro cmdopt
+.vitem  &%$1%&$=2+&~$2+
+.oindex &%$1%&
+.endmacro
+

 . --- A macro that generates .row, but puts &I; at the start of the first
 . --- argument, thus indenting it. Assume a minimum of two arguments, and
 . --- allow up to four arguments, which is as many as we'll ever need.
 . --- A macro that generates .row, but puts &I; at the start of the first
 . --- argument, thus indenting it. Assume a minimum of two arguments, and
 . --- allow up to four arguments, which is as many as we'll ever need.


@@ -134,6 +169,8 @@
 . --- style of entry, use .scindex for the start and .ecindex for the end. The
 . --- first argument of .scindex and the only argument of .ecindex must be the
 . --- ID that ties them together.
 . --- style of entry, use .scindex for the start and .ecindex for the end. The
 . --- first argument of .scindex and the only argument of .ecindex must be the
 . --- ID that ties them together.

+. --- The index entry points to the most-recent chapter head, section or subsection
+. --- head, or list-item.

 
 .macro cindex
 &<indexterm role="concept">&
 
 .macro cindex
 &<indexterm role="concept">&


@@ -166,6 +203,9 @@
 &</indexterm>&
 .endmacro
 
 &</indexterm>&
 .endmacro
 

+. --- The index entry points to the most-recent chapter head, section or subsection
+. --- head, or varlist item.
+

 .macro vindex
 &<indexterm role="variable">&
 &<primary>&$1&</primary>&
 .macro vindex
 &<indexterm role="variable">&
 &<primary>&$1&</primary>&


@@ -425,10 +465,11 @@ Please do not ask for configuration help in the bug-tracker.
 The following Exim mailing lists exist:
 
 .table2 140pt
 The following Exim mailing lists exist:
 
 .table2 140pt

-.row &'exim-announce@exim.org'&   "Moderated, low volume announcements list"
-.row &'exim-users@exim.org'&      "General discussion list"
-.row &'exim-dev@exim.org'&        "Discussion of bugs, enhancements, etc."
-.row &'exim-cvs@exim.org'&        "Automated commit messages from the VCS"
+.row &'exim-announce@lists.exim.org'&   "Moderated, low volume announcements list"
+.row &'exim-users@lists.exim.org'&      "General discussion list"
+.row &'exim-users-de@lists.exim.org'&   "General discussion list in German language"
+.row &'exim-dev@lists.exim.org'&        "Discussion of bugs, enhancements, etc."
+.row &'exim-cvs@lists.exim.org'&        "Automated commit messages from the VCS"

 .endtable
 
 You can subscribe to these lists, change your existing subscriptions, and view
 .endtable
 
 You can subscribe to these lists, change your existing subscriptions, and view


@@ -930,9 +971,10 @@ User filters are run as part of the routing process, described below.
 .cindex "base36"
 .cindex "Darwin"
 .cindex "Cygwin"
 .cindex "base36"
 .cindex "Darwin"
 .cindex "Cygwin"

-Every message handled by Exim is given a &'message id'& which is sixteen
+.cindex "exim_msgdate"
+Every message handled by Exim is given a &'message id'& which is 23

 characters long. It is divided into three parts, separated by hyphens, for
 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,
+example &`16VDhn-000000001bo-D342`&. 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
 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


@@ -953,21 +995,29 @@ started to be received, to a granularity of one second. That is, this field
 contains the number of seconds since the start of the epoch (the normal Unix
 way of representing the date and time of day).
 .next
 contains the number of seconds since the start of the epoch (the normal Unix
 way of representing the date and time of day).
 .next

-After the first hyphen, the next six characters are the id of the process that
-received the message.
+After the first hyphen, the next
+.new
+eleven
+.wen
+characters are the id of the process that received the message.

 .next
 .next

-There are two different possibilities for the final two characters:
+.new
+There are two different possibilities for the final four characters:

 .olist
 .oindex "&%localhost_number%&"
 If &%localhost_number%& is not set, this value is the fractional part of the
 .olist
 .oindex "&%localhost_number%&"
 If &%localhost_number%& is not set, this value is the fractional part of the

-time of reception, normally in units of 1/2000 of a second, but for systems
+time of reception, normally in units of
+microseconds.
+but for systems

 that must use base 36 instead of base 62 (because of case-insensitive file
 that must use base 36 instead of base 62 (because of case-insensitive file

-systems), the units are 1/1000 of a second.
+systems), the units are
+2 us.

 .next
 .next

-If &%localhost_number%& is set, it is multiplied by 200 (100) and added to
-the fractional part of the time, which in this case is in units of 1/200
-(1/100) of a second.
+If &%localhost_number%& is set, it is multiplied by
+500000 (250000) and added to
+the fractional part of the time, which in this case is in units of 2 us (4 us).

 .endlist
 .endlist

+.wen

 .endlist
 
 After a message has been received, Exim waits for the clock to tick at the
 .endlist
 
 After a message has been received, Exim waits for the clock to tick at the


@@ -976,6 +1026,10 @@ received by the same process, or by another process with the same (re-used)
 pid, it is guaranteed that the time will be different. In most cases, the clock
 will already have ticked while the message was being received.
 
 pid, it is guaranteed that the time will be different. In most cases, the clock
 will already have ticked while the message was being received.
 

+The exim_msgdate utility (see section &<<SECTexim_msgdate>>&) can be
+used to display the date, and optionally the process id, of an Exim
+Message ID.
+

 
 .section "Receiving mail" "SECID13"
 .cindex "receiving mail"
 
 .section "Receiving mail" "SECID13"
 .cindex "receiving mail"


@@ -2717,21 +2771,18 @@ outputs a brief message about itself and exits.
 
 
 .vlist
 
 
 .vlist

-.vitem &%--%&
-.oindex "--"
+.cmdopt "--" "--"

 .cindex "options" "command line; terminating"
 This is a pseudo-option whose only purpose is to terminate the options and
 therefore to cause subsequent command line items to be treated as arguments
 rather than options, even if they begin with hyphens.
 
 .cindex "options" "command line; terminating"
 This is a pseudo-option whose only purpose is to terminate the options and
 therefore to cause subsequent command line items to be treated as arguments
 rather than options, even if they begin with hyphens.
 

-.vitem &%--help%&
-.oindex "&%--help%&"
+.cmdopt --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
 no arguments.
 
 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
 no arguments.
 

-.vitem &%--version%&
-.oindex "&%--version%&"
+.cmdopt --version

 This option is an alias for &%-bV%& and causes version information to be
 displayed.
 
 This option is an alias for &%-bV%& and causes version information to be
 displayed.
 


@@ -2742,15 +2793,14 @@ displayed.
 These options are used by Sendmail for selecting configuration files and are
 ignored by Exim.
 
 These options are used by Sendmail for selecting configuration files and are
 ignored by Exim.
 

-.vitem &%-B%&<&'type'&>
+.cmdopt -B <&'type'&>

 .oindex "&%-B%&"
 .cindex "8-bit characters"
 .cindex "Sendmail compatibility" "8-bit characters"
 This is a Sendmail option for selecting 7 or 8 bit processing. Exim is 8-bit
 clean; it ignores this option.
 
 .oindex "&%-B%&"
 .cindex "8-bit characters"
 .cindex "Sendmail compatibility" "8-bit characters"
 This is a Sendmail option for selecting 7 or 8 bit processing. Exim is 8-bit
 clean; it ignores this option.
 

-.vitem &%-bd%&
-.oindex "&%-bd%&"
+.cmdopt -bd

 .cindex "daemon"
 .cindex "SMTP" "listener"
 .cindex "queue runner"
 .cindex "daemon"
 .cindex "SMTP" "listener"
 .cindex "queue runner"


@@ -2796,13 +2846,19 @@ 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.
 
 referenced from the configuration (for example, alias files) are changed,
 because these are reread each time they are used.
 

-.vitem &%-bdf%&
-.oindex "&%-bdf%&"
+.new
+Either a SIGTERM or a SIGINT signal should be used to cause the daemon
+to cleanly shut down.
+Subprocesses handling recceiving or delivering messages,
+or for scanning the queue,
+will not be affected by the termination of the daemon process.
+.wen
+
+.cmdopt -bdf

 This option has the same effect as &%-bd%& except that it never disconnects
 from the controlling terminal, even when no debugging is specified.
 
 This option has the same effect as &%-bd%& except that it never disconnects
 from the controlling terminal, even when no debugging is specified.
 

-.vitem &%-be%&
-.oindex "&%-be%&"
+.cmdopt -be

 .cindex "testing" "string expansion"
 .cindex "expansion" "testing"
 Run Exim in expansion testing mode. Exim discards its root privilege, to
 .cindex "testing" "string expansion"
 .cindex "expansion" "testing"
 Run Exim in expansion testing mode. Exim discards its root privilege, to


@@ -2840,8 +2896,7 @@ is recognised specially as defining a value for a variable.
 The syntax is otherwise the same as the ACL modifier &"set ="&.
 .wen
 
 The syntax is otherwise the same as the ACL modifier &"set ="&.
 .wen
 

-.vitem &%-bem%&&~<&'filename'&>
-.oindex "&%-bem%&"
+.cmdopt -bem <&'filename'&>

 .cindex "testing" "string expansion"
 .cindex "expansion" "testing"
 This option operates like &%-be%& except that it must be followed by the name
 .cindex "testing" "string expansion"
 .cindex "expansion" "testing"
 This option operates like &%-be%& except that it must be followed by the name


@@ -2858,16 +2913,14 @@ recipients are read from the headers in the normal way, and are shown in the
 line, because further arguments are taken as strings to expand (just like
 &%-be%&).
 
 line, because further arguments are taken as strings to expand (just like
 &%-be%&).
 

-.vitem &%-bF%&&~<&'filename'&>
-.oindex "&%-bF%&"
+.cmdopt -bF <&'filename'&>

 .cindex "system filter" "testing"
 .cindex "testing" "system filter"
 This option is the same as &%-bf%& except that it assumes that the filter being
 tested is a system filter. The additional commands that are available only in
 system filters are recognized.
 
 .cindex "system filter" "testing"
 .cindex "testing" "system filter"
 This option is the same as &%-bf%& except that it assumes that the filter being
 tested is a system filter. The additional commands that are available only in
 system filters are recognized.
 

-.vitem &%-bf%&&~<&'filename'&>
-.oindex "&%-bf%&"
+.cmdopt -bf <&'filename'&>

 .cindex "filter" "testing"
 .cindex "testing" "filter file"
 .cindex "forward file" "testing"
 .cindex "filter" "testing"
 .cindex "testing" "filter file"
 .cindex "forward file" "testing"


@@ -2913,37 +2966,32 @@ that would normally be taken from the envelope recipient address of the message
 can be set by means of additional command line options (see the next four
 options).
 
 can be set by means of additional command line options (see the next four
 options).
 

-.vitem &%-bfd%&&~<&'domain'&>
-.oindex "&%-bfd%&"
+.cmdopt -bfd <&'domain'&>

 .vindex "&$qualify_domain$&"
 This sets the domain of the recipient address when a filter file is being
 tested by means of the &%-bf%& option. The default is the value of
 &$qualify_domain$&.
 
 .vindex "&$qualify_domain$&"
 This sets the domain of the recipient address when a filter file is being
 tested by means of the &%-bf%& option. The default is the value of
 &$qualify_domain$&.
 

-.vitem &%-bfl%&&~<&'local&~part'&>
-.oindex "&%-bfl%&"
+.cmdopt -bfl <&'local&~part'&>

 This sets the local part of the recipient address when a filter file is being
 tested by means of the &%-bf%& option. The default is the username of the
 process that calls Exim. A local part should be specified with any prefix or
 suffix stripped, because that is how it appears to the filter when a message is
 actually being delivered.
 
 This sets the local part of the recipient address when a filter file is being
 tested by means of the &%-bf%& option. The default is the username of the
 process that calls Exim. A local part should be specified with any prefix or
 suffix stripped, because that is how it appears to the filter when a message is
 actually being delivered.
 

-.vitem &%-bfp%&&~<&'prefix'&>
-.oindex "&%-bfp%&"
+.cmdopt -bfp <&'prefix'&>

 .cindex affix "filter testing"
 This sets the prefix of the local part of the recipient address when a filter
 file is being tested by means of the &%-bf%& option. The default is an empty
 prefix.
 
 .cindex affix "filter testing"
 This sets the prefix of the local part of the recipient address when a filter
 file is being tested by means of the &%-bf%& option. The default is an empty
 prefix.
 

-.vitem &%-bfs%&&~<&'suffix'&>
-.oindex "&%-bfs%&"
+.cmdopt -bfs <&'suffix'&>

 .cindex affix "filter testing"
 This sets the suffix of the local part of the recipient address when a filter
 file is being tested by means of the &%-bf%& option. The default is an empty
 suffix.
 
 .cindex affix "filter testing"
 This sets the suffix of the local part of the recipient address when a filter
 file is being tested by means of the &%-bf%& option. The default is an empty
 suffix.
 

-.vitem &%-bh%&&~<&'IP&~address'&>
-.oindex "&%-bh%&"
+.cmdopt -bh <&'IP&~address'&>

 .cindex "testing" "incoming SMTP"
 .cindex "SMTP" "testing incoming"
 .cindex "testing" "relay control"
 .cindex "testing" "incoming SMTP"
 .cindex "SMTP" "testing incoming"
 .cindex "testing" "relay control"


@@ -2995,14 +3043,12 @@ plain text, cannot easily be tested with &%-bh%&. Instead, you should use a
 specialized SMTP test program such as
 &url(https://www.jetmore.org/john/code/swaks/,swaks).
 
 specialized SMTP test program such as
 &url(https://www.jetmore.org/john/code/swaks/,swaks).
 

-.vitem &%-bhc%&&~<&'IP&~address'&>
-.oindex "&%-bhc%&"
+.cmdopt -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.
 

-.vitem &%-bi%&
-.oindex "&%-bi%&"
+.cmdopt -bi

 .cindex "alias file" "building"
 .cindex "building alias file"
 .cindex "Sendmail compatibility" "&%-bi%& option"
 .cindex "alias file" "building"
 .cindex "building alias file"
 .cindex "Sendmail compatibility" "&%-bi%& option"


@@ -3021,8 +3067,7 @@ if this is required. If the &%bi_command%& option is not set, calling Exim with
 &%-bi%& is a no-op.
 
 . // Keep :help first, then the rest in alphabetical order
 &%-bi%& is a no-op.
 
 . // Keep :help first, then the rest in alphabetical order

-.vitem &%-bI:help%&
-.oindex "&%-bI:help%&"
+.cmdopt -bI:help

 .cindex "querying exim information"
 We shall provide various options starting &`-bI:`& for querying Exim for
 information.  The output of many of these will be intended for machine
 .cindex "querying exim information"
 We shall provide various options starting &`-bI:`& for querying Exim for
 information.  The output of many of these will be intended for machine


@@ -3030,14 +3075,12 @@ consumption.  This one is not.  The &%-bI:help%& option asks Exim for a
 synopsis of supported options beginning &`-bI:`&.  Use of any of these
 options shall cause Exim to exit after producing the requested output.
 
 synopsis of supported options beginning &`-bI:`&.  Use of any of these
 options shall cause Exim to exit after producing the requested output.
 

-.vitem &%-bI:dscp%&
-.oindex "&%-bI:dscp%&"
+.cmdopt -bI:dscp

 .cindex "DSCP" "values"
 This option causes Exim to emit an alphabetically sorted list of all
 recognised DSCP names.
 
 .cindex "DSCP" "values"
 This option causes Exim to emit an alphabetically sorted list of all
 recognised DSCP names.
 

-.vitem &%-bI:sieve%&
-.oindex "&%-bI:sieve%&"
+.cmdopt -bI:sieve

 .cindex "Sieve filter" "capabilities"
 This option causes Exim to emit an alphabetically sorted list of all supported
 Sieve protocol extensions on stdout, one per line.  This is anticipated to be
 .cindex "Sieve filter" "capabilities"
 This option causes Exim to emit an alphabetically sorted list of all supported
 Sieve protocol extensions on stdout, one per line.  This is anticipated to be


@@ -3046,8 +3089,7 @@ useful for ManageSieve (RFC 5804) implementations, in providing that protocol's
 compile-time build options, which this option will adapt to, this is the only
 way to guarantee a correct response.
 
 compile-time build options, which this option will adapt to, this is the only
 way to guarantee a correct response.
 

-.vitem &%-bm%&
-.oindex "&%-bm%&"
+.cmdopt -bm

 .cindex "local message reception"
 This option runs an Exim receiving process that accepts an incoming,
 locally-generated message on the standard input. The recipients are given as the
 .cindex "local message reception"
 This option runs an Exim receiving process that accepts an incoming,
 locally-generated message on the standard input. The recipients are given as the


@@ -3092,8 +3134,7 @@ The specified sender is treated as if it were given as the argument to the
 preference to the address taken from the message. The caller of Exim must be a
 trusted user for the sender of a message to be set in this way.
 
 preference to the address taken from the message. The caller of Exim must be a
 trusted user for the sender of a message to be set in this way.
 

-.vitem &%-bmalware%&&~<&'filename'&>
-.oindex "&%-bmalware%&"
+.cmdopt -bmalware <&'filename'&>

 .cindex "testing", "malware"
 .cindex "malware scan test"
 This debugging option causes Exim to scan the given file or directory
 .cindex "testing", "malware"
 .cindex "malware scan test"
 This debugging option causes Exim to scan the given file or directory


@@ -3113,8 +3154,7 @@ The &%-bmalware%& option will not be extended to be more generally useful,
 there are better tools for file-scanning.  This option exists to help
 administrators verify their Exim and AV scanner configuration.
 
 there are better tools for file-scanning.  This option exists to help
 administrators verify their Exim and AV scanner configuration.
 

-.vitem &%-bnq%&
-.oindex "&%-bnq%&"
+.cmdopt -bnq

 .cindex "address qualification, suppressing"
 By default, Exim automatically qualifies unqualified addresses (those
 without domains) that appear in messages that are submitted locally (that
 .cindex "address qualification, suppressing"
 By default, Exim automatically qualifies unqualified addresses (those
 without domains) that appear in messages that are submitted locally (that


@@ -3135,8 +3175,7 @@ addresses in the envelope provoke errors (causing message rejection) and
 unqualified addresses in header lines are left alone.
 
 
 unqualified addresses in header lines are left alone.
 
 

-.vitem &%-bP%&
-.oindex "&%-bP%&"
+.cmdopt -bP

 .cindex "configuration options" "extracting"
 .cindex "options" "configuration &-- extracting"
 If this option is given with no arguments, it causes the values of all Exim's
 .cindex "configuration options" "extracting"
 .cindex "options" "configuration &-- extracting"
 If this option is given with no arguments, it causes the values of all Exim's


@@ -3212,8 +3251,7 @@ The output format is one item per line.
 For the "-bP macro <name>" form, if no such macro is found
 the exit status will be nonzero.
 
 For the "-bP macro <name>" form, if no such macro is found
 the exit status will be nonzero.
 

-.vitem &%-bp%&
-.oindex "&%-bp%&"
+.cmdopt -bp

 .cindex "queue" "listing messages in"
 .cindex "listing" "messages in the queue"
 This option requests a listing of the contents of the mail queue on the
 .cindex "queue" "listing messages in"
 .cindex "listing" "messages in the queue"
 This option requests a listing of the contents of the mail queue on the


@@ -3250,48 +3288,50 @@ displayed with a D only when deliveries for all of its child addresses are
 complete.
 
 
 complete.
 
 

-.vitem &%-bpa%&
-.oindex "&%-bpa%&"
+.cmdopt -bpa

 This option operates like &%-bp%&, but in addition it shows delivered addresses
 that were generated from the original top level address(es) in each message by
 alias or forwarding operations. These addresses are flagged with &"+D"& instead
 of just &"D"&.
 
 
 This option operates like &%-bp%&, but in addition it shows delivered addresses
 that were generated from the original top level address(es) in each message by
 alias or forwarding operations. These addresses are flagged with &"+D"& instead
 of just &"D"&.
 
 

-.vitem &%-bpc%&
-.oindex "&%-bpc%&"
+.cmdopt -bpc

 .cindex "queue" "count of messages on"
 This option counts the number of messages in the queue, and writes the total
 to the standard output. It is restricted to admin users, unless
 &%queue_list_requires_admin%& is set false.
 
 
 .cindex "queue" "count of messages on"
 This option counts the number of messages in the queue, and writes the total
 to the standard output. It is restricted to admin users, unless
 &%queue_list_requires_admin%& is set false.
 
 

-.vitem &%-bpr%&
-.oindex "&%-bpr%&"
+.cmdopt -bpi
+.cindex queue "list of message IDs"
+This option operates like &%-bp%&, but only outputs message ids
+(one per line).
+
+
+.cmdopt -bpr

 This option operates like &%-bp%&, but the output is not sorted into
 chronological order of message arrival. This can speed it up when there are
 lots of messages in the queue, and is particularly useful if the output is
 going to be post-processed in a way that doesn't need the sorting.
 
 This option operates like &%-bp%&, but the output is not sorted into
 chronological order of message arrival. This can speed it up when there are
 lots of messages in the queue, and is particularly useful if the output is
 going to be post-processed in a way that doesn't need the sorting.
 

-.vitem &%-bpra%&
-.oindex "&%-bpra%&"
+.cmdopt -bpra

 This option is a combination of &%-bpr%& and &%-bpa%&.
 
 This option is a combination of &%-bpr%& and &%-bpa%&.
 

-.vitem &%-bpru%&
-.oindex "&%-bpru%&"
+.cmdopt -bpri
+This option is a combination of &%-bpr%& and &%-bpi%&.
+
+.cmdopt -bpru

 This option is a combination of &%-bpr%& and &%-bpu%&.
 
 
 This option is a combination of &%-bpr%& and &%-bpu%&.
 
 

-.vitem &%-bpu%&
-.oindex "&%-bpu%&"
+.cmdopt -bpu

 This option operates like &%-bp%& but shows only undelivered top-level
 addresses for each message displayed. Addresses generated by aliasing or
 forwarding are not shown, unless the message was deferred after processing by a
 router with the &%one_time%& option set.
 
 
 This option operates like &%-bp%& but shows only undelivered top-level
 addresses for each message displayed. Addresses generated by aliasing or
 forwarding are not shown, unless the message was deferred after processing by a
 router with the &%one_time%& option set.
 
 

-.vitem &%-brt%&
-.oindex "&%-brt%&"
+.cmdopt -brt

 .cindex "testing" "retry configuration"
 .cindex "retry" "configuration testing"
 This option is for testing retry rules, and it must be followed by up to three
 .cindex "testing" "retry configuration"
 .cindex "retry" "configuration testing"
 This option is for testing retry rules, and it must be followed by up to three


@@ -3315,8 +3355,7 @@ exim -brt haydn.comp.mus.example quota_3d
 Retry rule: *@haydn.comp.mus.example quota_3d  F,1h,15m
 .endd
 
 Retry rule: *@haydn.comp.mus.example quota_3d  F,1h,15m
 .endd
 

-.vitem &%-brw%&
-.oindex "&%-brw%&"
+.cmdopt -brw

 .cindex "testing" "rewriting"
 .cindex "rewriting" "testing"
 This option is for testing address rewriting rules, and it must be followed by
 .cindex "testing" "rewriting"
 .cindex "rewriting" "testing"
 This option is for testing address rewriting rules, and it must be followed by


@@ -3325,8 +3364,7 @@ complete address with a fully qualified domain. Exim outputs how this address
 would be rewritten for each possible place it might appear. See chapter
 &<<CHAPrewrite>>& for further details.
 
 would be rewritten for each possible place it might appear. See chapter
 &<<CHAPrewrite>>& for further details.
 

-.vitem &%-bS%&
-.oindex "&%-bS%&"
+.cmdopt -bS

 .cindex "SMTP" "batched incoming"
 .cindex "batched SMTP input"
 This option is used for batched SMTP input, which is an alternative interface
 .cindex "SMTP" "batched incoming"
 .cindex "batched SMTP input"
 This option is used for batched SMTP input, which is an alternative interface


@@ -3359,8 +3397,7 @@ was detected; otherwise it is 2.
 More details of input using batched SMTP are given in section
 &<<SECTincomingbatchedSMTP>>&.
 
 More details of input using batched SMTP are given in section
 &<<SECTincomingbatchedSMTP>>&.
 

-.vitem &%-bs%&
-.oindex "&%-bs%&"
+.cmdopt -bs

 .cindex "SMTP" "local input"
 .cindex "local SMTP input"
 This option causes Exim to accept one or more messages by reading SMTP commands
 .cindex "SMTP" "local input"
 .cindex "local SMTP input"
 This option causes Exim to accept one or more messages by reading SMTP commands


@@ -3388,8 +3425,7 @@ 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.
 
 Exim behaves in exactly the same way as it does when receiving a message via
 the listening daemon.
 

-.vitem &%-bt%&
-.oindex "&%-bt%&"
+.cmdopt -bt

 .cindex "testing" "addresses"
 .cindex "address" "testing"
 This option runs Exim in address testing mode, in which each argument is taken
 .cindex "testing" "addresses"
 .cindex "address" "testing"
 This option runs Exim in address testing mode, in which each argument is taken


@@ -3434,8 +3470,7 @@ whose behaviour depends on the contents of an incoming message, you cannot test
 those conditions using &%-bt%&. The &%-N%& option provides a possible way of
 doing such tests.
 
 those conditions using &%-bt%&. The &%-N%& option provides a possible way of
 doing such tests.
 

-.vitem &%-bV%&
-.oindex "&%-bV%&"
+.cmdopt -bV

 .cindex "version number of Exim"
 This option causes Exim to write the current version number, compilation
 number, and compilation date of the &'exim'& binary to the standard output.
 .cindex "version number of Exim"
 This option causes Exim to write the current version number, compilation
 number, and compilation date of the &'exim'& binary to the standard output.


@@ -3451,8 +3486,7 @@ alone to discover (for example) all the typos in the configuration; some
 realistic testing is needed. The &%-bh%& and &%-N%& options provide more
 dynamic testing facilities.
 
 realistic testing is needed. The &%-bh%& and &%-N%& options provide more
 dynamic testing facilities.
 

-.vitem &%-bv%&
-.oindex "&%-bv%&"
+.cmdopt -bv

 .cindex "verifying address" "using &%-bv%&"
 .cindex "address" "verification"
 This option runs Exim in address verification mode, in which each argument is
 .cindex "verifying address" "using &%-bv%&"
 .cindex "address" "verification"
 This option runs Exim in address verification mode, in which each argument is


@@ -3502,14 +3536,12 @@ address of a message, you should use the &%-f%& option to set an appropriate
 sender when running &%-bv%& tests. Without it, the sender is assumed to be the
 calling user at the default qualifying domain.
 
 sender when running &%-bv%& tests. Without it, the sender is assumed to be the
 calling user at the default qualifying domain.
 

-.vitem &%-bvs%&
-.oindex "&%-bvs%&"
+.cmdopt -bvs

 This option acts like &%-bv%&, but verifies the address as a sender rather
 than a recipient address. This affects any rewriting and qualification that
 might happen.
 
 This option acts like &%-bv%&, but verifies the address as a sender rather
 than a recipient address. This affects any rewriting and qualification that
 might happen.
 

-.vitem &%-bw%&
-.oindex "&%-bw%&"
+.cmdopt -bw

 .cindex "daemon"
 .cindex "inetd"
 .cindex "inetd" "wait mode"
 .cindex "daemon"
 .cindex "inetd"
 .cindex "inetd" "wait mode"


@@ -3525,8 +3557,7 @@ each port only when the first connection is received.
 If the option is given as &%-bw%&<&'time'&> then the time is a timeout, after
 which the daemon will exit, which should cause inetd to listen once more.
 
 If the option is given as &%-bw%&<&'time'&> then the time is a timeout, after
 which the daemon will exit, which should cause inetd to listen once more.
 

-.vitem &%-C%&&~<&'filelist'&>
-.oindex "&%-C%&"
+.cmdopt -C <&'filelist'&>

 .cindex "configuration file" "alternate"
 .cindex "CONFIGURE_FILE"
 .cindex "alternate configuration file"
 .cindex "configuration file" "alternate"
 .cindex "CONFIGURE_FILE"
 .cindex "alternate configuration file"


@@ -3706,14 +3737,12 @@ starts a daemon process. In that case, debugging is turned off for the
 subprocesses that the daemon creates. Thus, it is useful for monitoring the
 behaviour of the daemon without creating as much output as full debugging does.
 
 subprocesses that the daemon creates. Thus, it is useful for monitoring the
 behaviour of the daemon without creating as much output as full debugging does.
 

-.vitem &%-dropcr%&
-.oindex "&%-dropcr%&"
+.cmdopt -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
 described in section &<<SECTlineendings>>&.
 
 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>>&.
 

-.vitem &%-E%&
-.oindex "&%-E%&"
+.cmdopt -E

 .cindex "bounce message" "generating"
 This option specifies that an incoming message is a locally-generated delivery
 failure report. It is used internally by Exim when handling delivery failures
 .cindex "bounce message" "generating"
 This option specifies that an incoming message is a locally-generated delivery
 failure report. It is used internally by Exim when handling delivery failures


@@ -3730,8 +3759,7 @@ called by various programs without the leading &%o%& in the option. For
 example, the &%vacation%& program uses &%-eq%&. Exim treats all options of the
 form &%-e%&&'x'& as synonymous with the corresponding &%-oe%&&'x'& options.
 
 example, the &%vacation%& program uses &%-eq%&. Exim treats all options of the
 form &%-e%&&'x'& as synonymous with the corresponding &%-oe%&&'x'& options.
 

-.vitem &%-F%&&~<&'string'&>
-.oindex "&%-F%&"
+.cmdopt -F <&'string'&>

 .cindex "sender" "name"
 .cindex "name" "of sender"
 This option sets the sender's full name for use when a locally-generated
 .cindex "sender" "name"
 .cindex "name" "of sender"
 This option sets the sender's full name for use when a locally-generated


@@ -3740,8 +3768,7 @@ entry from the password data is used. As users are generally permitted to alter
 their &'gecos'& entries, no security considerations are involved. White space
 between &%-F%& and the <&'string'&> is optional.
 
 their &'gecos'& entries, no security considerations are involved. White space
 between &%-F%& and the <&'string'&> is optional.
 

-.vitem &%-f%&&~<&'address'&>
-.oindex "&%-f%&"
+.cmdopt -f <&'address'&>

 .cindex "sender" "address"
 .cindex "address" "sender"
 .cindex "trusted users"
 .cindex "sender" "address"
 .cindex "address" "sender"
 .cindex "trusted users"


@@ -3785,8 +3812,7 @@ locally-generated message can also be set (when permitted) by an initial
 &"From&~"& line in the message &-- see the description of &%-bm%& above &-- but
 if &%-f%& is also present, it overrides &"From&~"&.
 
 &"From&~"& line in the message &-- see the description of &%-bm%& above &-- but
 if &%-f%& is also present, it overrides &"From&~"&.
 

-.vitem &%-G%&
-.oindex "&%-G%&"
+.cmdopt -G

 .cindex "submission fixups, suppressing (command-line)"
 This option is equivalent to an ACL applying:
 .code
 .cindex "submission fixups, suppressing (command-line)"
 This option is equivalent to an ACL applying:
 .code


@@ -3799,15 +3825,13 @@ in future.
 As this affects audit information, the caller must be a trusted user to use
 this option.
 
 As this affects audit information, the caller must be a trusted user to use
 this option.
 

-.vitem &%-h%&&~<&'number'&>
-.oindex "&%-h%&"
+.cmdopt -h <&'number'&>

 .cindex "Sendmail compatibility" "&%-h%& option ignored"
 This option is accepted for compatibility with Sendmail, but has no effect. (In
 Sendmail it overrides the &"hop count"& obtained by counting &'Received:'&
 headers.)
 
 .cindex "Sendmail compatibility" "&%-h%& option ignored"
 This option is accepted for compatibility with Sendmail, but has no effect. (In
 Sendmail it overrides the &"hop count"& obtained by counting &'Received:'&
 headers.)
 

-.vitem &%-i%&
-.oindex "&%-i%&"
+.cmdopt -i

 .cindex "Solaris" "&'mail'& command"
 .cindex "dot" "in incoming non-SMTP message"
 This option, which has the same effect as &%-oi%&, specifies that a dot on a
 .cindex "Solaris" "&'mail'& command"
 .cindex "dot" "in incoming non-SMTP message"
 This option, which has the same effect as &%-oi%&, specifies that a dot on a


@@ -3817,8 +3841,7 @@ Solaris 2.4 (SunOS 5.4) Sendmail has a similar &%-i%& processing option
 p. 1M-529), and therefore a &%-oi%& command line option, which both are used
 by its &'mailx'& command.
 
 p. 1M-529), and therefore a &%-oi%& command line option, which both are used
 by its &'mailx'& command.
 

-.vitem &%-L%&&~<&'tag'&>
-.oindex "&%-L%&"
+.cmdopt -L <&'tag'&>

 .cindex "syslog" "process name; set with flag"
 This option is equivalent to setting &%syslog_processname%& in the config
 file and setting &%log_file_path%& to &`syslog`&.
 .cindex "syslog" "process name; set with flag"
 This option is equivalent to setting &%syslog_processname%& in the config
 file and setting &%log_file_path%& to &`syslog`&.


@@ -3828,8 +3851,7 @@ effect, so early configuration file errors will not honour this flag.
 
 The tag should not be longer than 32 characters.
 
 
 The tag should not be longer than 32 characters.
 

-.vitem &%-M%&&~<&'message&~id'&>&~<&'message&~id'&>&~...
-.oindex "&%-M%&"
+.cmdopt -M <&'message&~id'&>&~<&'message&~id'&>&~...

 .cindex "forcing delivery"
 .cindex "delivery" "forcing attempt"
 .cindex "frozen messages" "forcing delivery"
 .cindex "forcing delivery"
 .cindex "delivery" "forcing attempt"
 .cindex "frozen messages" "forcing delivery"


@@ -3851,8 +3873,7 @@ not terminate until all the delivery attempts have finished. No output is
 produced unless there is a serious error. If you want to see what is happening,
 use the &%-v%& option as well, or inspect Exim's main log.
 
 produced unless there is a serious error. If you want to see what is happening,
 use the &%-v%& option as well, or inspect Exim's main log.
 

-.vitem &%-Mar%&&~<&'message&~id'&>&~<&'address'&>&~<&'address'&>&~...
-.oindex "&%-Mar%&"
+.cmdopt -Mar <&'message&~id'&>&~<&'address'&>&~<&'address'&>&~...

 .cindex "message" "adding recipients"
 .cindex "recipient" "adding"
 This option requests Exim to add the addresses to the list of recipients of the
 .cindex "message" "adding recipients"
 .cindex "recipient" "adding"
 This option requests Exim to add the addresses to the list of recipients of the


@@ -3875,59 +3896,50 @@ an existing SMTP connection, which is passed as the standard input. Details are
 given in chapter &<<CHAPSMTP>>&. This must be the final option, and the caller
 must be root or the Exim user in order to use it.
 
 given in chapter &<<CHAPSMTP>>&. This must be the final option, and the caller
 must be root or the Exim user in order to use it.
 

-.vitem &%-MCA%&
-.oindex "&%-MCA%&"
+.cmdopt -MCA

 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option. It signifies that the
 connection to the remote host has been authenticated.
 
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option. It signifies that the
 connection to the remote host has been authenticated.
 

-.vitem &%-MCD%&
-.oindex "&%-MCD%&"
+.cmdopt -MCD

 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option. It signifies that the
 remote host supports the ESMTP &_DSN_& extension.
 
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option. It signifies that the
 remote host supports the ESMTP &_DSN_& extension.
 

-.vitem &%-MCd%&
-.oindex "&%-MCd%&"
+.cmdopt -MCd

 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-d%& option
 to pass on an information string on the purpose of the process.
 
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-d%& option
 to pass on an information string on the purpose of the process.
 

-.vitem &%-MCG%&&~<&'queue&~name'&>
-.oindex "&%-MCG%&"
+.cmdopt -MCG <&'queue&~name'&>

 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 an
 alternate queue is used, named by the following argument.
 
 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 an
 alternate queue is used, named by the following argument.
 

-.vitem &%-MCK%&
-.oindex "&%-MCK%&"
+.cmdopt -MCK

 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 a
 remote host supports the ESMTP &_CHUNKING_& extension.
 
 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 a
 remote host supports the ESMTP &_CHUNKING_& extension.
 

-.vitem &%-MCL%&
-.oindex "&%-MCL%&"
+.cmdopt -MCL

 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 advertised limits on numbers of mails, recipients or
 recipient domains.
 The limits are given by the following three arguments.
 
 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 advertised limits on numbers of mails, recipients or
 recipient domains.
 The limits are given by the following three arguments.
 

-.vitem &%-MCP%&
-.oindex "&%-MCP%&"
+.cmdopt -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
 which Exim is connected supports pipelining.
 
 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.
 

-.vitem &%-MCp%&
-.oindex "&%-MCp%&"
+.cmdopt -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 connection
 t a remote server is via a SOCKS proxy, using addresses and ports given by
 the following four arguments.
 
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option. It signifies that the connection
 t a remote server is via a SOCKS proxy, using addresses and ports given by
 the following four arguments.
 

-.vitem &%-MCQ%&&~<&'process&~id'&>&~<&'pipe&~fd'&>
-.oindex "&%-MCQ%&"
+.cmdopt -MCQ <&'process&~id'&>&~<&'pipe&~fd'&>

 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option when the original delivery was
 started by a queue runner. It passes on the process id of the queue runner,
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option when the original delivery was
 started by a queue runner. It passes on the process id of the queue runner,


@@ -3935,20 +3947,17 @@ together with the file descriptor number of an open pipe. Closure of the pipe
 signals the final completion of the sequence of processes that are passing
 messages through the same SMTP connection.
 
 signals the final completion of the sequence of processes that are passing
 messages through the same SMTP connection.
 

-.vitem &%-MCq%&&~<&'recipient&~address'&>&~<&'size'&>
-.oindex "&%-MCq%&"
+.cmdopt -MCq <&'recipient&~address'&>&~<&'size'&>

 This option is not intended for use by external callers. It is used internally
 by Exim to implement quota checking for local users.
 
 This option is not intended for use by external callers. It is used internally
 by Exim to implement quota checking for local users.
 

-.vitem &%-MCS%&
-.oindex "&%-MCS%&"
+.cmdopt -MCS

 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option, and passes on the fact that the
 ESMTP SIZE option should be used on messages delivered down the existing
 connection.
 
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option, and passes on the fact that the
 ESMTP SIZE option should be used on messages delivered down the existing
 connection.
 

-.vitem &%-MCT%&
-.oindex "&%-MCT%&"
+.cmdopt -MCT

 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option, and passes on the fact that the
 host to which Exim is connected supports TLS encryption.
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option, and passes on the fact that the
 host to which Exim is connected supports TLS encryption.


@@ -3963,15 +3972,13 @@ a TLS Server Name Indication was sent as part of the channel establishment.
 The argument gives the SNI string.
 The "r" variant indicates a DANE-verified connection.
 
 The argument gives the SNI string.
 The "r" variant indicates a DANE-verified connection.
 

-.vitem &%-MCt%&&~<&'IP&~address'&>&~<&'port'&>&~<&'cipher'&>
-.oindex "&%-MCt%&"
+.cmdopt -MCt <&'IP&~address'&>&~<&'port'&>&~<&'cipher'&>

 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option, and passes on the fact that the
 connection is being proxied by a parent process for handling TLS encryption.
 The arguments give the local address and port being proxied, and the TLS cipher.
 
 This option is not intended for use by external callers. It is used internally
 by Exim in conjunction with the &%-MC%& option, and passes on the fact that the
 connection is being proxied by a parent process for handling TLS encryption.
 The arguments give the local address and port being proxied, and the TLS cipher.
 

-.vitem &%-Mc%&&~<&'message&~id'&>&~<&'message&~id'&>&~...
-.oindex "&%-Mc%&"
+.cmdopt -Mc <&'message&~id'&>&~<&'message&~id'&>&~...

 .cindex "hints database" "not overridden by &%-Mc%&"
 .cindex "delivery" "manually started &-- not forced"
 This option requests Exim to run a delivery attempt on each message, in turn,
 .cindex "hints database" "not overridden by &%-Mc%&"
 .cindex "delivery" "manually started &-- not forced"
 This option requests Exim to run a delivery attempt on each message, in turn,


@@ -3986,8 +3993,7 @@ If you want to run a specific delivery as if in a queue run, you should use
 &%-q%& with a message id argument. A distinction between queue run deliveries
 and other deliveries is made in one or two places.
 
 &%-q%& with a message id argument. A distinction between queue run deliveries
 and other deliveries is made in one or two places.
 

-.vitem &%-Mes%&&~<&'message&~id'&>&~<&'address'&>
-.oindex "&%-Mes%&"
+.cmdopt -Mes <&'message&~id'&>&~<&'address'&>

 .cindex "message" "changing sender"
 .cindex "sender" "changing"
 This option requests Exim to change the sender address in the message to the
 .cindex "message" "changing sender"
 .cindex "sender" "changing"
 This option requests Exim to change the sender address in the message to the


@@ -3997,8 +4003,7 @@ be a message id, and the second one an email address. However, if the message
 is active (in the middle of a delivery attempt), its status is not altered.
 This option can be used only by an admin user.
 
 is active (in the middle of a delivery attempt), its status is not altered.
 This option can be used only by an admin user.
 

-.vitem &%-Mf%&&~<&'message&~id'&>&~<&'message&~id'&>&~...
-.oindex "&%-Mf%&"
+.cmdopt -Mf <&'message&~id'&>&~<&'message&~id'&>&~...

 .cindex "freezing messages"
 .cindex "message" "manually freezing"
 This option requests Exim to mark each listed message as &"frozen"&. This
 .cindex "freezing messages"
 .cindex "message" "manually freezing"
 This option requests Exim to mark each listed message as &"frozen"&. This


@@ -4008,20 +4013,18 @@ However, if any of the messages are active (in the middle of a delivery
 attempt), their status is not altered. This option can be used only by an admin
 user.
 
 attempt), their status is not altered. This option can be used only by an admin
 user.
 

-.vitem &%-Mg%&&~<&'message&~id'&>&~<&'message&~id'&>&~...
-.oindex "&%-Mg%&"
+.cmdopt -Mg <&'message&~id'&>&~<&'message&~id'&>&~...

 .cindex "giving up on messages"
 .cindex "message" "abandoning delivery attempts"
 .cindex "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. For non-bounce messages, a delivery error message
 .cindex "giving up on messages"
 .cindex "message" "abandoning delivery attempts"
 .cindex "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. For non-bounce messages, a delivery error message

-is sent to the sender, containing the text &"cancelled by administrator"&.
+is sent to the sender.

 Bounce messages are just discarded. This option can be used only by an admin
 user.
 
 Bounce messages are just discarded. This option can be used only by an admin
 user.
 

-.vitem &%-MG%&&~<&'queue&~name'&>&~<&'message&~id'&>&~<&'message&~id'&>&~...
-.oindex "&%-MG%&"
+.cmdopt -MG <&'queue&~name'&>&~<&'message&~id'&>&~<&'message&~id'&>&~...

 .cindex queue named
 .cindex "named queues" "moving messages"
 .cindex "queue" "moving messages"
 .cindex queue named
 .cindex "named queues" "moving messages"
 .cindex "queue" "moving messages"


@@ -4032,16 +4035,14 @@ string to define the default queue.
 If the messages are not currently located in the default queue,
 a &%-qG<name>%& option will be required to define the source queue.
 
 If the messages are not currently located in the default queue,
 a &%-qG<name>%& option will be required to define the source queue.
 

-.vitem &%-Mmad%&&~<&'message&~id'&>&~<&'message&~id'&>&~...
-.oindex "&%-Mmad%&"
+.cmdopt -Mmad <&'message&~id'&>&~<&'message&~id'&>&~...

 .cindex "delivery" "cancelling all"
 This option requests Exim to mark all the recipient addresses in the messages
 as already delivered (&"mad"& for &"mark all delivered"&). However, if any
 message is active (in the middle of a delivery attempt), its status is not
 altered. This option can be used only by an admin user.
 
 .cindex "delivery" "cancelling all"
 This option requests Exim to mark all the recipient addresses in the messages
 as already delivered (&"mad"& for &"mark all delivered"&). However, if any
 message is active (in the middle of a delivery attempt), its status is not
 altered. This option can be used only by an admin user.
 

-.vitem &%-Mmd%&&~<&'message&~id'&>&~<&'address'&>&~<&'address'&>&~...
-.oindex "&%-Mmd%&"
+.cmdopt -Mmd <&'message&~id'&>&~<&'address'&>&~<&'address'&>&~...

 .cindex "delivery" "cancelling by address"
 .cindex "recipient" "removing"
 .cindex "removing recipients"
 .cindex "delivery" "cancelling by address"
 .cindex "recipient" "removing"
 .cindex "removing recipients"


@@ -4052,8 +4053,7 @@ addresses in the message in a case-sensitive manner. If the message is active
 (in the middle of a delivery attempt), its status is not altered. This option
 can be used only by an admin user.
 
 (in the middle of a delivery attempt), its status is not altered. This option
 can be used only by an admin user.
 

-.vitem &%-Mrm%&&~<&'message&~id'&>&~<&'message&~id'&>&~...
-.oindex "&%-Mrm%&"
+.cmdopt -Mrm <&'message&~id'&>&~<&'message&~id'&>&~...

 .cindex "removing messages"
 .cindex "abandoning mail"
 .cindex "message" "manually discarding"
 .cindex "removing messages"
 .cindex "abandoning mail"
 .cindex "message" "manually discarding"


@@ -4072,8 +4072,7 @@ placed in the queue.
 . a bounce message.
 . .wen
 
 . a bounce message.
 . .wen
 

-.vitem &%-Mset%&&~<&'message&~id'&>
-.oindex "&%-Mset%&"
+.cmdopt -Mset <&'message&~id'&>

 .cindex "testing" "string expansion"
 .cindex "expansion" "testing"
 This option is useful only in conjunction with &%-be%& (that is, when testing
 .cindex "testing" "string expansion"
 .cindex "expansion" "testing"
 This option is useful only in conjunction with &%-be%& (that is, when testing


@@ -4084,8 +4083,7 @@ available. This feature is provided to make it easier to test expansions that
 make use of these variables. However, this option can be used only by an admin
 user. See also &%-bem%&.
 
 make use of these variables. However, this option can be used only by an admin
 user. See also &%-bem%&.
 

-.vitem &%-Mt%&&~<&'message&~id'&>&~<&'message&~id'&>&~...
-.oindex "&%-Mt%&"
+.cmdopt -Mt <&'message&~id'&>&~<&'message&~id'&>&~...

 .cindex "thawing messages"
 .cindex "unfreezing messages"
 .cindex "frozen messages" "thawing"
 .cindex "thawing messages"
 .cindex "unfreezing messages"
 .cindex "frozen messages" "thawing"


@@ -4095,44 +4093,38 @@ This option requests Exim to &"thaw"& any of the listed messages that are
 messages are active, their status is not altered. This option can be used only
 by an admin user.
 
 messages are active, their status is not altered. This option can be used only
 by an admin user.
 

-.vitem &%-Mvb%&&~<&'message&~id'&>
-.oindex "&%-Mvb%&"
+.cmdopt -Mvb <&'message&~id'&>

 .cindex "listing" "message body"
 .cindex "message" "listing body of"
 This option causes the contents of the message body (-D) spool file to be
 written to the standard output. This option can be used only by an admin user.
 
 .cindex "listing" "message body"
 .cindex "message" "listing body of"
 This option causes the contents of the message body (-D) spool file to be
 written to the standard output. This option can be used only by an admin user.
 

-.vitem &%-Mvc%&&~<&'message&~id'&>
-.oindex "&%-Mvc%&"
+.cmdopt -Mvc <&'message&~id'&>

 .cindex "message" "listing in RFC 2822 format"
 .cindex "listing" "message in RFC 2822 format"
 This option causes a copy of the complete message (header lines plus body) to
 be written to the standard output in RFC 2822 format. This option can be used
 only by an admin user.
 
 .cindex "message" "listing in RFC 2822 format"
 .cindex "listing" "message in RFC 2822 format"
 This option causes a copy of the complete message (header lines plus body) to
 be written to the standard output in RFC 2822 format. This option can be used
 only by an admin user.
 

-.vitem &%-Mvh%&&~<&'message&~id'&>
-.oindex "&%-Mvh%&"
+.cmdopt -Mvh <&'message&~id'&>

 .cindex "listing" "message headers"
 .cindex "header lines" "listing"
 .cindex "message" "listing header lines"
 This option causes the contents of the message headers (-H) spool file to be
 written to the standard output. This option can be used only by an admin user.
 
 .cindex "listing" "message headers"
 .cindex "header lines" "listing"
 .cindex "message" "listing header lines"
 This option causes the contents of the message headers (-H) spool file to be
 written to the standard output. This option can be used only by an admin user.
 

-.vitem &%-Mvl%&&~<&'message&~id'&>
-.oindex "&%-Mvl%&"
+.cmdopt -Mvl <&'message&~id'&>

 .cindex "listing" "message log"
 .cindex "message" "listing message log"
 This option causes the contents of the message log spool file to be written to
 the standard output. This option can be used only by an admin user.
 
 .cindex "listing" "message log"
 .cindex "message" "listing message log"
 This option causes the contents of the message log spool file to be written to
 the standard output. This option can be used only by an admin user.
 

-.vitem &%-m%&
-.oindex "&%-m%&"
+.cmdopt -m

 This is a synonym for &%-om%& that is accepted by Sendmail
 (&url(https://docs.oracle.com/cd/E19457-01/801-6680-1M/801-6680-1M.pdf)
 p. 1M-258), so Exim treats it that way too.
 
 This is a synonym for &%-om%& that is accepted by Sendmail
 (&url(https://docs.oracle.com/cd/E19457-01/801-6680-1M/801-6680-1M.pdf)
 p. 1M-258), so Exim treats it that way too.
 

-.vitem &%-N%&
-.oindex "&%-N%&"
+.cmdopt -N

 .cindex "debugging" "&%-N%& option"
 .cindex "debugging" "suppressing delivery"
 This is a debugging option that inhibits delivery of a message at the transport
 .cindex "debugging" "&%-N%& option"
 .cindex "debugging" "suppressing delivery"
 This is a debugging option that inhibits delivery of a message at the transport


@@ -4151,27 +4143,23 @@ routing problem. Once &%-N%& has been used for a delivery attempt, it sticks to
 the message, and applies to any subsequent delivery attempts that may happen
 for that message.
 
 the message, and applies to any subsequent delivery attempts that may happen
 for that message.
 

-.vitem &%-n%&
-.oindex "&%-n%&"
+.cmdopt -n

 This option is interpreted by Sendmail to mean &"no aliasing"&.
 For normal modes of operation, it is ignored by Exim.
 When combined with &%-bP%& it makes the output more terse (suppresses
 option names, environment values and config pretty printing).
 
 This option is interpreted by Sendmail to mean &"no aliasing"&.
 For normal modes of operation, it is ignored by Exim.
 When combined with &%-bP%& it makes the output more terse (suppresses
 option names, environment values and config pretty printing).
 

-.vitem &%-O%&&~<&'data'&>
-.oindex "&%-O%&"
+.cmdopt -O <&'data'&>

 This option is interpreted by Sendmail to mean &`set option`&. It is ignored by
 Exim.
 
 This option is interpreted by Sendmail to mean &`set option`&. It is ignored by
 Exim.
 

-.vitem &%-oA%&&~<&'file&~name'&>
-.oindex "&%-oA%&"
+.cmdopt -oA <&'file&~name'&>

 .cindex "Sendmail compatibility" "&%-oA%& option"
 This option is used by Sendmail in conjunction with &%-bi%& to specify an
 alternative alias filename. Exim handles &%-bi%& differently; see the
 description above.
 
 .cindex "Sendmail compatibility" "&%-oA%& option"
 This option is used by Sendmail in conjunction with &%-bi%& to specify an
 alternative alias filename. Exim handles &%-bi%& differently; see the
 description above.
 

-.vitem &%-oB%&&~<&'n'&>
-.oindex "&%-oB%&"
+.cmdopt -oB <&'n'&>

 .cindex "SMTP" "passed connection"
 .cindex "SMTP" "multiple deliveries"
 .cindex "multiple SMTP deliveries"
 .cindex "SMTP" "passed connection"
 .cindex "SMTP" "multiple deliveries"
 .cindex "multiple SMTP deliveries"


@@ -4179,8 +4167,7 @@ This is a debugging option which limits the maximum number of messages that can
 be delivered down one SMTP connection, overriding the value set in any &(smtp)&
 transport. If <&'n'&> is omitted, the limit is set to 1.
 
 be delivered down one SMTP connection, overriding the value set in any &(smtp)&
 transport. If <&'n'&> is omitted, the limit is set to 1.
 

-.vitem &%-odb%&
-.oindex "&%-odb%&"
+.cmdopt -odb

 .cindex "background delivery"
 .cindex "delivery" "in the background"
 This option applies to all modes in which Exim accepts incoming messages,
 .cindex "background delivery"
 .cindex "delivery" "in the background"
 This option applies to all modes in which Exim accepts incoming messages,


@@ -4199,8 +4186,7 @@ If one of the queueing options in the configuration file
 overrides it if &%queue_only_override%& is set true, which is the default
 setting. If &%queue_only_override%& is set false, &%-odb%& has no effect.
 
 overrides it if &%queue_only_override%& is set true, which is the default
 setting. If &%queue_only_override%& is set false, &%-odb%& has no effect.
 

-.vitem &%-odf%&
-.oindex "&%-odf%&"
+.cmdopt -odf

 .cindex "foreground delivery"
 .cindex "delivery" "in the foreground"
 This option requests &"foreground"& (synchronous) delivery when Exim has
 .cindex "foreground delivery"
 .cindex "delivery" "in the foreground"
 This option requests &"foreground"& (synchronous) delivery when Exim has


@@ -4221,13 +4207,11 @@ process exits. See chapter &<<CHAPnonqueueing>>& for a way of setting up a
 restricted configuration that never queues messages.
 
 
 restricted configuration that never queues messages.
 
 

-.vitem &%-odi%&
-.oindex "&%-odi%&"
+.cmdopt -odi

 This option is synonymous with &%-odf%&. It is provided for compatibility with
 Sendmail.
 
 This option is synonymous with &%-odf%&. It is provided for compatibility with
 Sendmail.
 

-.vitem &%-odq%&
-.oindex "&%-odq%&"
+.cmdopt -odq

 .cindex "non-immediate delivery"
 .cindex "delivery" "suppressing immediate"
 .cindex "queueing incoming messages"
 .cindex "non-immediate delivery"
 .cindex "delivery" "suppressing immediate"
 .cindex "queueing incoming messages"


@@ -4240,8 +4224,7 @@ process encounters them. There are several configuration options (such as
 conditions. This option overrides all of them and also &%-odqs%&. It always
 forces queueing.
 
 conditions. This option overrides all of them and also &%-odqs%&. It always
 forces queueing.
 

-.vitem &%-odqs%&
-.oindex "&%-odqs%&"
+.cmdopt -odqs

 .cindex "SMTP" "delaying delivery"
 .cindex "first pass routing"
 This option is a hybrid between &%-odb%&/&%-odi%& and &%-odq%&.
 .cindex "SMTP" "delaying delivery"
 .cindex "first pass routing"
 This option is a hybrid between &%-odb%&/&%-odi%& and &%-odq%&.


@@ -4260,8 +4243,7 @@ host can be sent in a single SMTP connection. The &%queue_smtp_domains%&
 configuration option has the same effect for specific domains. See also the
 &%-qq%& option.
 
 configuration option has the same effect for specific domains. See also the
 &%-qq%& option.
 

-.vitem &%-oee%&
-.oindex "&%-oee%&"
+.cmdopt -oee

 .cindex "error" "reporting"
 If an error is detected while a non-SMTP message is being received (for
 example, a malformed address), the error is reported to the sender in a mail
 .cindex "error" "reporting"
 If an error is detected while a non-SMTP message is being received (for
 example, a malformed address), the error is reported to the sender in a mail


@@ -4274,36 +4256,31 @@ exits with a return code of zero. If not, the return code is 2 if the problem
 is that the original message has no recipients, or 1 for any other error.
 This is the default &%-oe%&&'x'& option if Exim is called as &'rmail'&.
 
 is that the original message has no recipients, or 1 for any other error.
 This is the default &%-oe%&&'x'& option if Exim is called as &'rmail'&.
 

-.vitem &%-oem%&
-.oindex "&%-oem%&"
+.cmdopt -oem

 .cindex "error" "reporting"
 .cindex "return code" "for &%-oem%&"
 This is the same as &%-oee%&, except that Exim always exits with a non-zero
 return code, whether or not the error message was successfully sent.
 This is the default &%-oe%&&'x'& option, unless Exim is called as &'rmail'&.
 
 .cindex "error" "reporting"
 .cindex "return code" "for &%-oem%&"
 This is the same as &%-oee%&, except that Exim always exits with a non-zero
 return code, whether or not the error message was successfully sent.
 This is the default &%-oe%&&'x'& option, unless Exim is called as &'rmail'&.
 

-.vitem &%-oep%&
-.oindex "&%-oep%&"
+.cmdopt -oep

 .cindex "error" "reporting"
 If an error is detected while a non-SMTP message is being received, the
 error is reported by writing a message to the standard error file (stderr).
 .cindex "return code" "for &%-oep%&"
 The return code is 1 for all errors.
 
 .cindex "error" "reporting"
 If an error is detected while a non-SMTP message is being received, the
 error is reported by writing a message to the standard error file (stderr).
 .cindex "return code" "for &%-oep%&"
 The return code is 1 for all errors.
 

-.vitem &%-oeq%&
-.oindex "&%-oeq%&"
+.cmdopt -oeq

 .cindex "error" "reporting"
 This option is supported for compatibility with Sendmail, but has the same
 effect as &%-oep%&.
 
 .cindex "error" "reporting"
 This option is supported for compatibility with Sendmail, but has the same
 effect as &%-oep%&.
 

-.vitem &%-oew%&
-.oindex "&%-oew%&"
+.cmdopt -oew

 .cindex "error" "reporting"
 This option is supported for compatibility with Sendmail, but has the same
 effect as &%-oem%&.
 
 .cindex "error" "reporting"
 This option is supported for compatibility with Sendmail, but has the same
 effect as &%-oem%&.
 

-.vitem &%-oi%&
-.oindex "&%-oi%&"
+.cmdopt -oi

 .cindex "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. Otherwise, a
 .cindex "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. Otherwise, a


@@ -4311,12 +4288,10 @@ single dot does terminate, though Exim does no special processing for other
 lines that start with a dot. This option is set by default if Exim is called as
 &'rmail'&. See also &%-ti%&.
 
 lines that start with a dot. This option is set by default if Exim is called as
 &'rmail'&. See also &%-ti%&.
 

-.vitem &%-oitrue%&
-.oindex "&%-oitrue%&"
+.cmdopt -oitrue

 This option is treated as synonymous with &%-oi%&.
 
 This option is treated as synonymous with &%-oi%&.
 

-.vitem &%-oMa%&&~<&'host&~address'&>
-.oindex "&%-oMa%&"
+.cmdopt -oMa <&'host&~address'&>

 .cindex "sender" "host address, specifying for local message"
 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
 .cindex "sender" "host address, specifying for local message"
 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


@@ -4339,8 +4314,7 @@ port, if present, in &$sender_host_port$&. If both &%-oMa%& and &%-bh%&
 are present on the command line, the sender host IP address is taken from
 whichever one is last.
 
 are present on the command line, the sender host IP address is taken from
 whichever one is last.
 

-.vitem &%-oMaa%&&~<&'name'&>
-.oindex "&%-oMaa%&"
+.cmdopt -oMaa <&'name'&>

 .cindex "authentication" "name, specifying for local message"
 See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMaa%&
 option sets the value of &$sender_host_authenticated$& (the authenticator
 .cindex "authentication" "name, specifying for local message"
 See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMaa%&
 option sets the value of &$sender_host_authenticated$& (the authenticator


@@ -4348,8 +4322,7 @@ name). See chapter &<<CHAPSMTPAUTH>>& for a discussion of SMTP authentication.
 This option can be used with &%-bh%& and &%-bs%& to set up an
 authenticated SMTP session without actually using the SMTP AUTH command.
 
 This option can be used with &%-bh%& and &%-bs%& to set up an
 authenticated SMTP session without actually using the SMTP AUTH command.
 

-.vitem &%-oMai%&&~<&'string'&>
-.oindex "&%-oMai%&"
+.cmdopt -oMai <&'string'&>

 .cindex "authentication" "id, specifying for local message"
 See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMai%&
 option sets the value of &$authenticated_id$& (the id that was authenticated).
 .cindex "authentication" "id, specifying for local message"
 See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMai%&
 option sets the value of &$authenticated_id$& (the id that was authenticated).


@@ -4357,8 +4330,7 @@ This overrides the default value (the caller's login id, except with &%-bh%&,
 where there is no default) for messages from local sources. See chapter
 &<<CHAPSMTPAUTH>>& for a discussion of authenticated ids.
 
 where there is no default) for messages from local sources. See chapter
 &<<CHAPSMTPAUTH>>& for a discussion of authenticated ids.
 

-.vitem &%-oMas%&&~<&'address'&>
-.oindex "&%-oMas%&"
+.cmdopt -oMas <&'address'&>

 .cindex "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$&. It
 .cindex "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$&. It


@@ -4368,16 +4340,14 @@ default. For both &%-bh%& and &%-bs%&, an authenticated sender that is
 specified on a MAIL command overrides this value. See chapter
 &<<CHAPSMTPAUTH>>& for a discussion of authenticated senders.
 
 specified on a MAIL command overrides this value. See chapter
 &<<CHAPSMTPAUTH>>& for a discussion of authenticated senders.
 

-.vitem &%-oMi%&&~<&'interface&~address'&>
-.oindex "&%-oMi%&"
+.cmdopt -oMi <&'interface&~address'&>

 .cindex "interface" "address, specifying for local message"
 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
 &$received_ip_address$& and the port number, if present, in &$received_port$&.
 
 .cindex "interface" "address, specifying for local message"
 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
 &$received_ip_address$& and the port number, if present, in &$received_port$&.
 

-.vitem &%-oMm%&&~<&'message&~reference'&>
-.oindex "&%-oMm%&"
+.cmdopt -oMm <&'message&~reference'&>

 .cindex "message reference" "message reference, specifying for local message"
 See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMm%&
 option sets the message reference, e.g. message-id, and is logged during
 .cindex "message reference" "message reference, specifying for local message"
 See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMm%&
 option sets the message reference, e.g. message-id, and is logged during


@@ -4390,8 +4360,7 @@ The best example of a message reference is when Exim sends a bounce message.
 The message reference is the message-id of the original message for which Exim
 is sending the bounce.
 
 The message reference is the message-id of the original message for which Exim
 is sending the bounce.
 

-.vitem &%-oMr%&&~<&'protocol&~name'&>
-.oindex "&%-oMr%&"
+.cmdopt -oMr <&'protocol&~name'&>

 .cindex "protocol, specifying for local message"
 .vindex "&$received_protocol$&"
 See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMr%&
 .cindex "protocol, specifying for local message"
 .vindex "&$received_protocol$&"
 See &%-oMa%& above for general remarks about the &%-oM%& options. The &%-oMr%&


@@ -4403,37 +4372,32 @@ SMTP protocol names (see the description of &$received_protocol$& in section
 one of those same names. For &%-bS%& (batched SMTP) however, the protocol can
 be set by &%-oMr%&. Repeated use of this option is not supported.
 
 one of those same names. For &%-bS%& (batched SMTP) however, the protocol can
 be set by &%-oMr%&. Repeated use of this option is not supported.
 

-.vitem &%-oMs%&&~<&'host&~name'&>
-.oindex "&%-oMs%&"
+.cmdopt -oMs <&'host&~name'&>

 .cindex "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 to look up a host name from an IP address; it
 uses the name it is given.
 
 .cindex "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 to look up a host name from an IP address; it
 uses the name it is given.
 

-.vitem &%-oMt%&&~<&'ident&~string'&>
-.oindex "&%-oMt%&"
+.cmdopt -oMt <&'ident&~string'&>

 .cindex "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$&. The default setting for
 local callers is the login id of the calling process, except when &%-bh%& is
 used, when there is no default.
 
 .cindex "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$&. The default setting for
 local callers is the login id of the calling process, except when &%-bh%& is
 used, when there is no default.
 

-.vitem &%-om%&
-.oindex "&%-om%&"
+.cmdopt -om

 .cindex "Sendmail compatibility" "&%-om%& option ignored"
 In Sendmail, this option means &"me too"&, indicating that the sender of a
 message should receive a copy of the message if the sender appears in an alias
 expansion. Exim always does this, so the option does nothing.
 
 .cindex "Sendmail compatibility" "&%-om%& option ignored"
 In Sendmail, this option means &"me too"&, indicating that the sender of a
 message should receive a copy of the message if the sender appears in an alias
 expansion. Exim always does this, so the option does nothing.
 

-.vitem &%-oo%&
-.oindex "&%-oo%&"
+.cmdopt -oo

 .cindex "Sendmail compatibility" "&%-oo%& option ignored"
 This option is ignored. In Sendmail it specifies &"old style headers"&,
 whatever that means.
 
 .cindex "Sendmail compatibility" "&%-oo%& option ignored"
 This option is ignored. In Sendmail it specifies &"old style headers"&,
 whatever that means.
 

-.vitem &%-oP%&&~<&'path'&>
-.oindex "&%-oP%&"
+.cmdopt -oP <&'path'&>

 .cindex "pid (process id)" "of daemon"
 .cindex "daemon" "process id (pid)"
 This option is useful only in conjunction with &%-bd%& or &%-q%& with a time
 .cindex "pid (process id)" "of daemon"
 .cindex "daemon" "process id (pid)"
 This option is useful only in conjunction with &%-bd%& or &%-q%& with a time


@@ -4442,8 +4406,7 @@ 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,
 because in those cases, the normal pid file is not used.
 
 without &%-bd%&, this is the only way of causing Exim to write a pid file,
 because in those cases, the normal pid file is not used.
 

-.vitem &%-oPX%&
-.oindex "&%-oPX%&"
+.cmdopt -oPX

 .cindex "pid (process id)" "of daemon"
 .cindex "daemon" "process id (pid)"
 This option is not intended for general use.
 .cindex "pid (process id)" "of daemon"
 .cindex "daemon" "process id (pid)"
 This option is not intended for general use.


@@ -4451,16 +4414,14 @@ The daemon uses it when terminating due to a SIGTEM, possibly in
 combination with &%-oP%&&~<&'path'&>.
 It causes the pid file to be removed.
 
 combination with &%-oP%&&~<&'path'&>.
 It causes the pid file to be removed.
 

-.vitem &%-or%&&~<&'time'&>
-.oindex "&%-or%&"
+.cmdopt -or <&'time'&>

 .cindex "timeout" "for non-SMTP input"
 This option sets a timeout value for incoming non-SMTP messages. If it is not
 set, Exim will wait forever for the standard input. The value can also be set
 by the &%receive_timeout%& option. The format used for specifying times is
 described in section &<<SECTtimeformat>>&.
 
 .cindex "timeout" "for non-SMTP input"
 This option sets a timeout value for incoming non-SMTP messages. If it is not
 set, Exim will wait forever for the standard input. The value can also be set
 by the &%receive_timeout%& option. The format used for specifying times is
 described in section &<<SECTtimeformat>>&.
 

-.vitem &%-os%&&~<&'time'&>
-.oindex "&%-os%&"
+.cmdopt -os <&'time'&>

 .cindex "timeout" "for SMTP input"
 .cindex "SMTP" "input timeout"
 This option sets a timeout value for incoming SMTP messages. The timeout
 .cindex "timeout" "for SMTP input"
 .cindex "SMTP" "input timeout"
 This option sets a timeout value for incoming SMTP messages. The timeout


@@ -4468,12 +4429,10 @@ applies to each SMTP command and block of data. The value can also be set by
 the &%smtp_receive_timeout%& option; it defaults to 5 minutes. The format used
 for specifying times is described in section &<<SECTtimeformat>>&.
 
 the &%smtp_receive_timeout%& option; it defaults to 5 minutes. The format used
 for specifying times is described in section &<<SECTtimeformat>>&.
 

-.vitem &%-ov%&
-.oindex "&%-ov%&"
+.cmdopt -ov

 This option has exactly the same effect as &%-v%&.
 
 This option has exactly the same effect as &%-v%&.
 

-.vitem &%-oX%&&~<&'number&~or&~string'&>
-.oindex "&%-oX%&"
+.cmdopt -oX <&'number&~or&~string'&>

 .cindex "TCP/IP" "setting listening ports"
 .cindex "TCP/IP" "setting listening interfaces"
 .cindex "port" "receiving TCP/IP"
 .cindex "TCP/IP" "setting listening ports"
 .cindex "TCP/IP" "setting listening interfaces"
 .cindex "port" "receiving TCP/IP"


@@ -4483,8 +4442,7 @@ of the syntax, and how it interacts with configuration file options, are given
 in chapter &<<CHAPinterfaces>>&. When &%-oX%& is used to start a daemon, no pid
 file is written unless &%-oP%& is also present to specify a pid filename.
 
 in chapter &<<CHAPinterfaces>>&. When &%-oX%& is used to start a daemon, no pid
 file is written unless &%-oP%& is also present to specify a pid filename.
 

-.vitem &%-oY%&
-.oindex &%-oY%&
+.cmdopt -oY

 .cindex "daemon notifier socket"
 This option controls the creation of an inter-process communications endpoint
 by the Exim daemon.
 .cindex "daemon notifier socket"
 This option controls the creation of an inter-process communications endpoint
 by the Exim daemon.


@@ -4492,26 +4450,30 @@ It is only relevant when the &%-bd%& (start listening daemon) option is also
 given.
 Normally the daemon creates this socket, unless a &%-oX%& and &*no*& &%-oP%&
 option is also present.
 given.
 Normally the daemon creates this socket, unless a &%-oX%& and &*no*& &%-oP%&
 option is also present.

-If this option is given then the socket will not be created.  This could be
-required if the system is running multiple daemons.
+.new
+If this option is given then the socket will not be created.  This is required
+if the system is running multiple daemons, in which case it should
+be used on all.
+The features supported by the socket will not be available in such cases.

 
 The socket is currently used for
 .ilist
 fast ramp-up of queue runner processes
 .next
 
 The socket is currently used for
 .ilist
 fast ramp-up of queue runner processes
 .next

+caching compiled regexes
+.next

 obtaining a current queue size
 .endlist
 obtaining a current queue size
 .endlist

+.wen

 
 

-.vitem &%-pd%&
-.oindex "&%-pd%&"
+.cmdopt -pd

 .cindex "Perl" "starting the interpreter"
 This option applies when an embedded Perl interpreter is linked with Exim (see
 chapter &<<CHAPperl>>&). It overrides the setting of the &%perl_at_start%&
 option, forcing the starting of the interpreter to be delayed until it is
 needed.
 
 .cindex "Perl" "starting the interpreter"
 This option applies when an embedded Perl interpreter is linked with Exim (see
 chapter &<<CHAPperl>>&). It overrides the setting of the &%perl_at_start%&
 option, forcing the starting of the interpreter to be delayed until it is
 needed.
 

-.vitem &%-ps%&
-.oindex "&%-ps%&"
+.cmdopt -ps

 .cindex "Perl" "starting the interpreter"
 This option applies when an embedded Perl interpreter is linked with Exim (see
 chapter &<<CHAPperl>>&). It overrides the setting of the &%perl_at_start%&
 .cindex "Perl" "starting the interpreter"
 This option applies when an embedded Perl interpreter is linked with Exim (see
 chapter &<<CHAPperl>>&). It overrides the setting of the &%perl_at_start%&


@@ -4531,8 +4493,7 @@ to embedded Perl. It is therefore impossible to set a protocol value of &`d`&
 or &`s`& using this option (but that does not seem a real limitation).
 Repeated use of this option is not supported.
 
 or &`s`& using this option (but that does not seem a real limitation).
 Repeated use of this option is not supported.
 

-.vitem &%-q%&
-.oindex "&%-q%&"
+.cmdopt -q

 .cindex "queue runner" "starting manually"
 This option is normally restricted to admin users. However, there is a
 configuration option called &%prod_requires_admin%& which can be set false to
 .cindex "queue runner" "starting manually"
 This option is normally restricted to admin users. However, there is a
 configuration option called &%prod_requires_admin%& which can be set false to


@@ -4587,23 +4548,33 @@ every domain. Addresses are routed, local deliveries happen, but no remote
 transports are run.
 
 Performance will be best if the &%queue_run_in_order%& option is false.
 transports are run.
 
 Performance will be best if the &%queue_run_in_order%& option is false.

-If that is so and the &%queue_fast_ramp%& option is true then
-in the first phase of the run,
+If that is so and
+the &%queue_fast_ramp%& option is true
+and a daemon-notifier socket is available
+then in the first phase of the run,

 once a threshold number of messages are routed for a given host,
 a delivery process is forked in parallel with the rest of the scan.
 
 .cindex "hints database" "remembering routing"
 The hints database that remembers which messages are waiting for specific hosts
 once a threshold number of messages are routed for a given host,
 a delivery process is forked in parallel with the rest of the scan.
 
 .cindex "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 deferred. After this is
-complete, a second, normal queue scan happens, with routing and delivery taking
-place as normal. Messages that are routed to the same host should mostly be
+is updated, as if delivery to those hosts had been deferred.
+
+After the first queue scan complete,
+a second, normal queue scan is done, with routing and delivery taking
+place as normal.
+Messages that are routed to the same host should mostly be

 delivered down a single SMTP
 .cindex "SMTP" "passed connection"
 .cindex "SMTP" "multiple deliveries"
 .cindex "multiple SMTP deliveries"
 connection because of the hints that were set up during the first queue scan.
 delivered down a single SMTP
 .cindex "SMTP" "passed connection"
 .cindex "SMTP" "multiple deliveries"
 .cindex "multiple SMTP deliveries"
 connection because of the hints that were set up during the first queue scan.

-This option may be useful for hosts that are connected to the Internet
+
+.new
+Two-phase queue runs should be used on systems which, even intermittently,
+have a large queue (such as mailing-list operators).
+They may also be useful for hosts that are connected to the Internet

 intermittently.
 intermittently.

+.wen

 
 .vitem &%-q[q]i...%&
 .oindex "&%-qi%&"
 
 .vitem &%-q[q]i...%&
 .oindex "&%-qi%&"


@@ -4689,6 +4660,15 @@ combined daemon at system boot time is to use a command such as
 Such a daemon listens for incoming SMTP calls, and also starts a queue runner
 process every 30 minutes.
 
 Such a daemon listens for incoming SMTP calls, and also starts a queue runner
 process every 30 minutes.
 

+.new
+.cindex "named queues" "queue runners"
+It is possible to set up runners for multiple named queues within one daemon,
+For example:
+.code
+exim -qGhipri/2m -q10m -qqGmailinglist/1h
+.endd
+.wen
+

 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.
 
 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.
 


@@ -4748,8 +4728,7 @@ command ETRN is accepted by its ACL (see chapter &<<CHAPACL>>&), its default
 effect is to run Exim with the &%-R%& option, but it can be configured to run
 an arbitrary command instead.
 
 effect is to run Exim with the &%-R%& option, but it can be configured to run
 an arbitrary command instead.
 

-.vitem &%-r%&
-.oindex "&%-r%&"
+.cmdopt -r

 This is a documented (for Sendmail) obsolete alternative name for &%-f%&.
 
 .vitem &%-S%&<&'rsflags'&>&~<&'string'&>
 This is a documented (for Sendmail) obsolete alternative name for &%-f%&.
 
 .vitem &%-S%&<&'rsflags'&>&~<&'string'&>


@@ -4761,14 +4740,12 @@ message's sender instead of against the recipients. If &%-R%& is also set, both
 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.
 
 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.
 

-.vitem &%-Tqt%&&~<&'times'&>
-.oindex "&%-Tqt%&"
+.cmdopt -Tqt <&'times'&>

 This is 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.
 
 This is 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.
 

-.vitem &%-t%&
-.oindex "&%-t%&"
+.cmdopt -t

 .cindex "recipient" "extracting from header lines"
 .chindex Bcc:
 .chindex Cc:
 .cindex "recipient" "extracting from header lines"
 .chindex Bcc:
 .chindex Cc:


@@ -4808,13 +4785,11 @@ are often added at the end of the header, and if a message is resent more than
 once, it is common for the original set of &%Resent-%& headers to be renamed as
 &%X-Resent-%& when a new set is added. This removes any possible ambiguity.
 
 once, it is common for the original set of &%Resent-%& headers to be renamed as
 &%X-Resent-%& when a new set is added. This removes any possible ambiguity.
 

-.vitem &%-ti%&
-.oindex "&%-ti%&"
+.cmdopt -ti

 This option is exactly equivalent to &%-t%& &%-i%&. It is provided for
 compatibility with Sendmail.
 
 This option is exactly equivalent to &%-t%& &%-i%&. It is provided for
 compatibility with Sendmail.
 

-.vitem &%-tls-on-connect%&
-.oindex "&%-tls-on-connect%&"
+.cmdopt -tls-on-connect

 .cindex "TLS" "use without STARTTLS"
 .cindex "TLS" "automatic start"
 This option is available when Exim is compiled with TLS support. It forces all
 .cindex "TLS" "use without STARTTLS"
 .cindex "TLS" "automatic start"
 This option is available when Exim is compiled with TLS support. It forces all


@@ -4823,16 +4798,14 @@ incoming SMTP connections to behave as if the incoming port is listed in the
 &<<CHAPTLS>>& for further details.
 
 
 &<<CHAPTLS>>& for further details.
 
 

-.vitem &%-U%&
-.oindex "&%-U%&"
+.cmdopt -U

 .cindex "Sendmail compatibility" "&%-U%& option ignored"
 Sendmail uses this option for &"initial message submission"&, and its
 documentation states that in future releases, it may complain about
 syntactically invalid messages rather than fixing them when this flag is not
 set. Exim ignores this option.
 
 .cindex "Sendmail compatibility" "&%-U%& option ignored"
 Sendmail uses this option for &"initial message submission"&, and its
 documentation states that in future releases, it may complain about
 syntactically invalid messages rather than fixing them when this flag is not
 set. Exim ignores this option.
 

-.vitem &%-v%&
-.oindex "&%-v%&"
+.cmdopt -v

 This option causes Exim to write information to the standard error stream,
 describing what it is doing. In particular, it shows the log lines for
 receiving and delivering a message, and if an SMTP connection is made, the SMTP
 This option causes Exim to write information to the standard error stream,
 describing what it is doing. In particular, it shows the log lines for
 receiving and delivering a message, and if an SMTP connection is made, the SMTP


@@ -4841,20 +4814,17 @@ the log if the setting of &%log_selector%& discards them. Any relevant
 selectors are shown with each log line. If none are shown, the logging is
 unconditional.
 
 selectors are shown with each log line. If none are shown, the logging is
 unconditional.
 

-.vitem &%-x%&
-.oindex "&%-x%&"
+.cmdopt -x

 AIX uses &%-x%& for a private purpose (&"mail from a local mail program has
 National Language Support extended characters in the body of the mail item"&).
 It sets &%-x%& when calling the MTA from its &%mail%& command. Exim ignores
 this option.
 
 AIX uses &%-x%& for a private purpose (&"mail from a local mail program has
 National Language Support extended characters in the body of the mail item"&).
 It sets &%-x%& when calling the MTA from its &%mail%& command. Exim ignores
 this option.
 

-.vitem &%-X%&&~<&'logfile'&>
-.oindex "&%-X%&"
+.cmdopt -X <&'logfile'&>

 This option is interpreted by Sendmail to cause debug information to be sent
 to the named file.  It is ignored by Exim.
 
 This option is interpreted by Sendmail to cause debug information to be sent
 to the named file.  It is ignored by Exim.
 

-.vitem &%-z%&&~<&'log-line'&>
-.oindex "&%-z%&"
+.cmdopt -z <&'log-line'&>

 This option writes its argument to Exim's logfile.
 Use is restricted to administrators; the intent is for operational notes.
 Quotes should be used to maintain a multi-word item as a single argument,
 This option writes its argument to Exim's logfile.
 Use is restricted to administrators; the intent is for operational notes.
 Quotes should be used to maintain a multi-word item as a single argument,


@@ -5211,6 +5181,10 @@ The following classes of macros are defined:
 &` _DRIVER_ROUTER_*           `&  router drivers
 &` _DRIVER_TRANSPORT_*        `&  transport drivers
 &` _DRIVER_AUTHENTICATOR_*    `&  authenticator drivers
 &` _DRIVER_ROUTER_*           `&  router drivers
 &` _DRIVER_TRANSPORT_*        `&  transport drivers
 &` _DRIVER_AUTHENTICATOR_*    `&  authenticator drivers

+&` _EXP_COND_*                `&  expansion conditions
+&` _EXP_ITEM_*                `&  expansion items
+&` _EXP_OP_*                  `&  expansion operators
+&` _EXP_VAR_*                 `&  expansion variables

 &` _LOG_*                     `&  log_selector values
 &` _OPT_MAIN_*                `&  main config options
 &` _OPT_ROUTERS_*             `&  generic router options
 &` _LOG_*                     `&  log_selector values
 &` _OPT_MAIN_*                `&  main config options
 &` _OPT_ROUTERS_*             `&  generic router options


@@ -6667,15 +6641,17 @@ cause parts of the string to be replaced by data that is obtained from the
 lookup. Lookups of this type are conditional expansion items. Different results
 can be defined for the cases of lookup success and failure. See chapter
 &<<CHAPexpand>>&, where string expansions are described in detail.
 lookup. Lookups of this type are conditional expansion items. Different results
 can be defined for the cases of lookup success and failure. See chapter
 &<<CHAPexpand>>&, where string expansions are described in detail.

-The key for the lookup is &*specified*& as part of the string expansion.
+The key for the lookup is &*specified*& as part of the string to be expanded.

 .next
 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
 returned by the lookup is often (but not always) discarded; whether the lookup
 succeeds or fails is what really counts. These kinds of list are described in
 chapter &<<CHAPdomhosaddlists>>&.
 .next
 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
 returned by the lookup is often (but not always) discarded; whether the lookup
 succeeds or fails is what really counts. These kinds of list are described in
 chapter &<<CHAPdomhosaddlists>>&.

-The key for the lookup is &*implicit*&,
-given by the context in which the list is expanded.
+Depending on the lookup type (see below)
+the key for the lookup may need to be &*specified*& as above
+or may be &*implicit*&,
+given by the context in which the list is being checked.

 .endlist
 
 String expansions, lists, and lookups interact with each other in such a way
 .endlist
 
 String expansions, lists, and lookups interact with each other in such a way


@@ -6694,6 +6670,7 @@ Be careful to distinguish between the following two examples:
 domains = ${lookup{$sender_host_address}lsearch{/some/file}}
 domains = lsearch;/some/file
 .endd
 domains = ${lookup{$sender_host_address}lsearch{/some/file}}
 domains = lsearch;/some/file
 .endd

+.ilist

 The first uses a string expansion, the result of which must be a domain list.
 The key for an expansion-style lookup must be given explicitly.
 No strings have been specified for a successful or a failing lookup; the
 The first uses a string expansion, the result of which must be a domain list.
 The key for an expansion-style lookup must be given explicitly.
 No strings have been specified for a successful or a failing lookup; the


@@ -6707,9 +6684,10 @@ file that is searched could contain lines like this:
 When the lookup succeeds, the result of the expansion is a list of domains (and
 possibly other types of item that are allowed in domain lists).
 .cindex "tainted data" "de-tainting"
 When the lookup succeeds, the result of the expansion is a list of domains (and
 possibly other types of item that are allowed in domain lists).
 .cindex "tainted data" "de-tainting"

-.cindex "de-tainting" "using a lookup expansion""
+.cindex "de-tainting" "using a lookup expansion"

 The result of the expansion is not tainted.
 
 The result of the expansion is not tainted.
 

+.next

 In the second example, 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.
 In the second example, 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.


@@ -6723,7 +6701,8 @@ matches the list item.
 
 The key for a list-style lookup is implicit, from the lookup context, if
 the lookup is a single-key type (see below).
 
 The key for a list-style lookup is implicit, from the lookup context, if
 the lookup is a single-key type (see below).

-For query-style lookup types the key must be given explicitly.
+For query-style lookup types the query must be given explicitly.
+.endlist

 
 It is possible, though no doubt confusing, to use both kinds of lookup at once.
 Consider a file containing lines like this:
 
 It is possible, though no doubt confusing, to use both kinds of lookup at once.
 Consider a file containing lines like this:


@@ -6768,11 +6747,18 @@ If this is given and the lookup
 (either underlying implementation or cached value)
 returns data, the result is replaced with a non-tainted
 version of the lookup key.
 (either underlying implementation or cached value)
 returns data, the result is replaced with a non-tainted
 version of the lookup key.

+

 .next
 .cindex "query-style lookup" "definition of"
 The &'query-style'& type accepts a generalized database query. No particular
 key value is assumed by Exim for query-style lookups. You can use whichever
 Exim variables you need to construct the database query.
 .next
 .cindex "query-style lookup" "definition of"
 The &'query-style'& type accepts a generalized database query. No particular
 key value is assumed by Exim for query-style lookups. You can use whichever
 Exim variables you need to construct the database query.

+
+For the string-expansion kind of lookups, the query is given in the first
+bracketed argument of the &${lookup ...}$& expansion.
+For the list-argument kind of lookup the quury is given by the remainder of the
+list item after the first semicolon.
+

 .cindex "tainted data" "quoting for lookups"
 If tainted data is used in the query then it should be quuted by
 using the &*${quote_*&<&'lookup-type'&>&*:*&<&'string'&>&*}*& expansion operator
 .cindex "tainted data" "quoting for lookups"
 If tainted data is used in the query then it should be quuted by
 using the &*${quote_*&<&'lookup-type'&>&*:*&<&'string'&>&*}*& expansion operator


@@ -6798,11 +6784,11 @@ libraries and header files before building Exim.
 .cindex "single-key lookup" "list of types"
 The following single-key lookup types are implemented:
 
 .cindex "single-key lookup" "list of types"
 The following single-key lookup types are implemented:
 

-.ilist
+.subsection cdb

 .cindex "cdb" "description of"
 .cindex "lookup" "cdb"
 .cindex "binary zero" "in lookup key"
 .cindex "cdb" "description of"
 .cindex "lookup" "cdb"
 .cindex "binary zero" "in lookup key"

-&(cdb)&: The given file is searched as a Constant DataBase file, using the key
+The given file is searched as a Constant DataBase file, using the key

 string without a terminating binary zero. The cdb format is designed for
 indexed files that are read frequently and never updated, except by total
 re-creation. As such, it is particularly suitable for large files containing
 string without a terminating binary zero. The cdb format is designed for
 indexed files that are read frequently and never updated, except by total
 re-creation. As such, it is particularly suitable for large files containing


@@ -6818,11 +6804,12 @@ A cdb distribution is not needed in order to build Exim with cdb support,
 because the code for reading cdb files is included directly in Exim itself.
 However, no means of building or testing cdb files is provided with Exim, so
 you need to obtain a cdb distribution in order to do this.
 because the code for reading cdb files is included directly in Exim itself.
 However, no means of building or testing cdb files is provided with Exim, so
 you need to obtain a cdb distribution in order to do this.

-.next
+
+.subsection dbm

 .cindex "DBM" "lookup type"
 .cindex "lookup" "dbm"
 .cindex "binary zero" "in lookup key"
 .cindex "DBM" "lookup type"
 .cindex "lookup" "dbm"
 .cindex "binary zero" "in lookup key"

-&(dbm)&: Calls to DBM library functions are used to extract data from the given
+Calls to DBM library functions are used to extract data from the given

 DBM file by looking up the record with the given key. A terminating binary
 zero is included in the key that is passed to the DBM library. See section
 &<<SECTdb>>& for a discussion of DBM libraries.
 DBM file by looking up the record with the given key. A terminating binary
 zero is included in the key that is passed to the DBM library. See section
 &<<SECTdb>>& for a discussion of DBM libraries.


@@ -6834,25 +6821,27 @@ 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
 other applications. (For earlier DB versions, DB_HASH is always used.)
 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
 other applications. (For earlier DB versions, DB_HASH is always used.)

-.next
+
+.subsection dbmjz

 .cindex "lookup" "dbmjz"
 .cindex "lookup" "dbm &-- embedded NULs"
 .cindex "sasldb2"
 .cindex "dbmjz lookup type"
 .cindex "lookup" "dbmjz"
 .cindex "lookup" "dbm &-- embedded NULs"
 .cindex "sasldb2"
 .cindex "dbmjz lookup type"

-&(dbmjz)&: This is the same as &(dbm)&, except that the lookup key is
+This is the same as &(dbm)&, except that the lookup key is

 interpreted as an Exim list; the elements of the list are joined together with
 ASCII NUL characters to form the lookup key.  An example usage would be to
 authenticate incoming SMTP calls using the passwords from Cyrus SASL's
 &_/etc/sasldb2_& file with the &(gsasl)& authenticator or Exim's own
 &(cram_md5)& authenticator.
 interpreted as an Exim list; the elements of the list are joined together with
 ASCII NUL characters to form the lookup key.  An example usage would be to
 authenticate incoming SMTP calls using the passwords from Cyrus SASL's
 &_/etc/sasldb2_& file with the &(gsasl)& authenticator or Exim's own
 &(cram_md5)& authenticator.

-.next
+
+.subsection dbmnz

 .cindex "lookup" "dbmnz"
 .cindex "lookup" "dbm &-- terminating zero"
 .cindex "binary zero" "in lookup key"
 .cindex "Courier"
 .cindex "&_/etc/userdbshadow.dat_&"
 .cindex "dbmnz lookup type"
 .cindex "lookup" "dbmnz"
 .cindex "lookup" "dbm &-- terminating zero"
 .cindex "binary zero" "in lookup key"
 .cindex "Courier"
 .cindex "&_/etc/userdbshadow.dat_&"
 .cindex "dbmnz lookup type"

-&(dbmnz)&: This is the same as &(dbm)&, except that a terminating binary zero
+This is the same as &(dbm)&, except that a terminating binary zero

 is not included in the key that is passed to the DBM library. You may need this
 if you want to look up data in files that are created by or shared with some
 other application that does not use terminating zeros. For example, you need to
 is not included in the key that is passed to the DBM library. You may need this
 if you want to look up data in files that are created by or shared with some
 other application that does not use terminating zeros. For example, you need to


@@ -6860,15 +6849,13 @@ use &(dbmnz)& rather than &(dbm)& if you want to authenticate incoming SMTP
 calls using the passwords from Courier's &_/etc/userdbshadow.dat_& file. Exim's
 utility program for creating DBM files (&'exim_dbmbuild'&) includes the zeros
 by default, but has an option to omit them (see section &<<SECTdbmbuild>>&).
 calls using the passwords from Courier's &_/etc/userdbshadow.dat_& file. Exim's
 utility program for creating DBM files (&'exim_dbmbuild'&) includes the zeros
 by default, but has an option to omit them (see section &<<SECTdbmbuild>>&).

-.next
+
+.subsection dsearch

 .cindex "lookup" "dsearch"
 .cindex "dsearch lookup type"
 .cindex "lookup" "dsearch"
 .cindex "dsearch lookup type"

-&(dsearch)&: The given file must be an
-absolute
-directory path; this is searched for an entry
+The given file must be an absolute directory path; this is searched for an entry

 whose name is the key by calling the &[lstat()]& function.
 whose name is the key by calling the &[lstat()]& function.

-The key may not
-contain any forward slash characters.
+The key may not contain any forward slash characters.

 If &[lstat()]& succeeds then so does the lookup.
 .cindex "tainted data" "dsearch result"
 The result is regarded as untainted.
 If &[lstat()]& succeeds then so does the lookup.
 .cindex "tainted data" "dsearch result"
 The result is regarded as untainted.


@@ -6897,10 +6884,11 @@ and symlinks.
 An example of how this
 lookup can be used to support virtual domains is given in section
 &<<SECTvirtualdomains>>&.
 An example of how this
 lookup can be used to support virtual domains is given in section
 &<<SECTvirtualdomains>>&.

-.next
+
+.subsection iplsearch

 .cindex "lookup" "iplsearch"
 .cindex "iplsearch lookup type"
 .cindex "lookup" "iplsearch"
 .cindex "iplsearch lookup type"

-&(iplsearch)&: The given file is a text file containing keys and data. A key is
+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
 IPv6 addresses must be enclosed in quotes to prevent the first internal colon
 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
 IPv6 addresses must be enclosed in quotes to prevent the first internal colon


@@ -6933,11 +6921,11 @@ One option is supported, "ret=full", to request the return of the entire line
 rather than omitting the key portion.
 Note however that the key portion will have been de-quoted.
 
 rather than omitting the key portion.
 Note however that the key portion will have been de-quoted.
 

-.next
+.subsection json

 .cindex lookup json
 .cindex json "lookup type"
 .cindex JSON expansions
 .cindex lookup json
 .cindex json "lookup type"
 .cindex JSON expansions

-&(json)&: The given file is a text file with a JSON structure.
+The given file is a text file with a JSON structure.

 An element of the structure is extracted, defined by the search key.
 The key is a list of subelement selectors
 (colon-separated by default but changeable in the usual way)
 An element of the structure is extracted, defined by the search key.
 The key is a list of subelement selectors
 (colon-separated by default but changeable in the usual way)


@@ -6952,11 +6940,11 @@ is returned.
 For elements of type string, the returned value is de-quoted.
 
 
 For elements of type string, the returned value is de-quoted.
 
 

-.next
+.subsection lmdb

 .cindex LMDB
 .cindex lookup lmdb
 .cindex database lmdb
 .cindex LMDB
 .cindex lookup lmdb
 .cindex database lmdb

-&(lmdb)&: The given file is an LMDB database.
+The given file is an LMDB database.

 LMDB is a memory-mapped key-value store,
 with API modeled loosely on that of BerkeleyDB.
 See &url(https://symas.com/products/lightning-memory-mapped-database/)
 LMDB is a memory-mapped key-value store,
 with API modeled loosely on that of BerkeleyDB.
 See &url(https://symas.com/products/lightning-memory-mapped-database/)


@@ -6971,12 +6959,12 @@ You will need to separately create the LMDB database file,
 possibly using the &"mdb_load"& utility.
 
 
 possibly using the &"mdb_load"& utility.
 
 

-.next
+.subsection lsearch

 .cindex "linear search"
 .cindex "lookup" "lsearch"
 .cindex "lsearch lookup type"
 .cindex "case sensitivity" "in lsearch lookup"
 .cindex "linear search"
 .cindex "lookup" "lsearch"
 .cindex "lsearch lookup type"
 .cindex "case sensitivity" "in lsearch lookup"

-&(lsearch)&: The given file is a text file that is searched linearly for a
+The given file is a text file that is searched linearly for a

 line beginning with the search key, terminated by a colon or white space or the
 end of the line. The search is case-insensitive; that is, upper and lower case
 letters are treated as the same. The first occurrence of the key that is found
 line beginning with the search key, terminated by a colon or white space or the
 end of the line. The search is case-insensitive; that is, upper and lower case
 letters are treated as the same. The first occurrence of the key that is found


@@ -7006,17 +6994,17 @@ contents (see section &<<SECTstrings>>&). An optional colon is permitted after
 quoted keys (exactly as for unquoted keys). There is no special handling of
 quotes for the data part of an &(lsearch)& line.
 
 quoted keys (exactly as for unquoted keys). There is no special handling of
 quotes for the data part of an &(lsearch)& line.
 

-.next
+.subsection nis

 .cindex "NIS lookup type"
 .cindex "lookup" "NIS"
 .cindex "binary zero" "in lookup key"
 .cindex "NIS lookup type"
 .cindex "lookup" "NIS"
 .cindex "binary zero" "in lookup key"

-&(nis)&: The given file is the name of a NIS map, and a NIS lookup is done with
+The given file is the name of a NIS map, and a NIS lookup is done with

 the given key, without a terminating binary zero. There is a variant called
 &(nis0)& which does include the terminating binary zero in the key. This is
 reportedly needed for Sun-style alias files. Exim does not recognize NIS
 aliases; the full map names must be used.
 
 the given key, without a terminating binary zero. There is a variant called
 &(nis0)& which does include the terminating binary zero in the key. This is
 reportedly needed for Sun-style alias files. Exim does not recognize NIS
 aliases; the full map names must be used.
 

-.next
+.subsection (n)wildlsearch

 .cindex "wildlsearch lookup type"
 .cindex "lookup" "wildlsearch"
 .cindex "nwildlsearch lookup type"
 .cindex "wildlsearch lookup type"
 .cindex "lookup" "wildlsearch"
 .cindex "nwildlsearch lookup type"


@@ -7032,32 +7020,29 @@ Like &(lsearch)&, the testing is done case-insensitively. However, keys in the
 file that are regular expressions can be made case-sensitive by the use of
 &`(-i)`& within the pattern. The following forms of wildcard are recognized:
 
 file that are regular expressions can be made case-sensitive by the use of
 &`(-i)`& within the pattern. The following forms of wildcard are recognized:
 

-. ==== As this is a nested list, any displays it contains must be indented
-. ==== as otherwise they are too far to the left.
-

 .olist
 The string may begin with an asterisk to mean &"ends with"&. For example:
 .code
 .olist
 The string may begin with an asterisk to mean &"ends with"&. For example:
 .code

-    *.a.b.c       data for anything.a.b.c
-    *fish         data for anythingfish
+*.a.b.c       data for anything.a.b.c
+*fish         data for anythingfish

 .endd
 .next
 The string may begin with a circumflex to indicate a regular expression. For
 example, for &(wildlsearch)&:
 .code
 .endd
 .next
 The string may begin with a circumflex to indicate a regular expression. For
 example, for &(wildlsearch)&:
 .code

-    ^\N\d+\.a\.b\N    data for <digits>.a.b
+^\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
 string-expanded, the equivalent entry is:
 .code
 .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
 string-expanded, the equivalent entry is:
 .code

-    ^\d+\.a\.b        data for <digits>.a.b
+^\d+\.a\.b        data for <digits>.a.b

 .endd
 The case-insensitive flag is set at the start of compiling the regular
 expression, but it can be turned off by using &`(-i)`& at an appropriate point.
 For example, to make the entire pattern case-sensitive:
 .code
 .endd
 The case-insensitive flag is set at the start of compiling the regular
 expression, but it can be turned off by using &`(-i)`& at an appropriate point.
 For example, to make the entire pattern case-sensitive:
 .code

-    ^(?-i)\d+\.a\.b        data for <digits>.a.b
+^(?-i)\d+\.a\.b        data for <digits>.a.b

 .endd
 
 If the regular expression contains white space or colon characters, you must
 .endd
 
 If the regular expression contains white space or colon characters, you must


@@ -7078,7 +7063,7 @@ 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:
 .code
 lookup name terminated by a semicolon, and followed by lookup data. For
 example:
 .code

-    cdb;/some/file  data for keys that match the file
+cdb;/some/file  data for keys that match the file

 .endd
 The data that is obtained from the nested lookup is discarded.
 .endlist olist
 .endd
 The data that is obtained from the nested lookup is discarded.
 .endlist olist


@@ -7091,13 +7076,12 @@ be followed by optional colons.
 &((n)wildlsearch)& can &'not'& be turned into a DBM or cdb file, because those
 lookup types support only literal keys.
 
 &((n)wildlsearch)& can &'not'& be turned into a DBM or cdb file, because those
 lookup types support only literal keys.
 

-.next
+.subsection spf

 .cindex "spf lookup type"
 .cindex "lookup" "spf"
 .cindex "spf lookup type"
 .cindex "lookup" "spf"

-&(spf)&: If Exim is built with SPF support, manual lookups can be done
+If Exim is built with SPF support, manual lookups can be done

 (as opposed to the standard ACL condition method).
 For details see section &<<SECSPF>>&.
 (as opposed to the standard ACL condition method).
 For details see section &<<SECSPF>>&.

-.endlist ilist

 
 
 .section "Query-style lookup types" "SECTquerystylelookups"
 
 
 .section "Query-style lookup types" "SECTquerystylelookups"


@@ -7106,44 +7090,50 @@ For details see section &<<SECSPF>>&.
 The supported query-style lookup types are listed below. Further details about
 many of them are given in later sections.
 
 The supported query-style lookup types are listed below. Further details about
 many of them are given in later sections.
 

-.ilist
+.subsection dnsdb

 .cindex "DNS" "as a lookup type"
 .cindex "lookup" "DNS"
 .cindex "DNS" "as a lookup type"
 .cindex "lookup" "DNS"

-&(dnsdb)&: This does a DNS search for one or more records whose domain names
+This does a DNS search for one or more records whose domain names

 are given in the supplied query. The resulting data is the contents of the
 records. See section &<<SECTdnsdb>>&.
 are given in the supplied query. The resulting data is the contents of the
 records. See section &<<SECTdnsdb>>&.

-.next
+
+.subsection ibase

 .cindex "InterBase lookup type"
 .cindex "lookup" "InterBase"
 .cindex "InterBase lookup type"
 .cindex "lookup" "InterBase"

-&(ibase)&: This does a lookup in an InterBase database.
-.next
+This does a lookup in an InterBase database.
+
+.subsection ldap

 .cindex "LDAP" "lookup type"
 .cindex "lookup" "LDAP"
 .cindex "LDAP" "lookup type"
 .cindex "lookup" "LDAP"

-&(ldap)&: This does an LDAP lookup using a query in the form of a URL, and
+This does an LDAP lookup using a query in the form of a URL, and

 returns attributes from a single entry. There is a variant called &(ldapm)&
 that permits values from multiple entries to be returned. A third variant
 called &(ldapdn)& returns the Distinguished Name of a single entry instead of
 any attribute values. See section &<<SECTldap>>&.
 returns attributes from a single entry. There is a variant called &(ldapm)&
 that permits values from multiple entries to be returned. A third variant
 called &(ldapdn)& returns the Distinguished Name of a single entry instead of
 any attribute values. See section &<<SECTldap>>&.

-.next
+
+.subsection mysql

 .cindex "MySQL" "lookup type"
 .cindex "lookup" "MySQL"
 .cindex "MySQL" "lookup type"
 .cindex "lookup" "MySQL"

-&(mysql)&: The format of the query is an SQL statement that is passed to a
+The format of the query is an SQL statement that is passed to a

 MySQL database. See section &<<SECTsql>>&.
 MySQL database. See section &<<SECTsql>>&.

-.next
+
+.subsection nisplus

 .cindex "NIS+ lookup type"
 .cindex "lookup" "NIS+"
 .cindex "NIS+ lookup type"
 .cindex "lookup" "NIS+"

-&(nisplus)&: This does a NIS+ lookup using a query that can specify the name of
+This does a NIS+ lookup using a query that can specify the name of

 the field to be returned. See section &<<SECTnisplus>>&.
 the field to be returned. See section &<<SECTnisplus>>&.

-.next
+
+.subsection oracle

 .cindex "Oracle" "lookup type"
 .cindex "lookup" "Oracle"
 .cindex "Oracle" "lookup type"
 .cindex "lookup" "Oracle"

-&(oracle)&: The format of the query is an SQL statement that is passed to an
+The format of the query is an SQL statement that is passed to an

 Oracle database. See section &<<SECTsql>>&.
 Oracle database. See section &<<SECTsql>>&.

-.next
+
+.subsection passwd

 .cindex "lookup" "passwd"
 .cindex "passwd lookup type"
 .cindex "&_/etc/passwd_&"
 .cindex "lookup" "passwd"
 .cindex "passwd lookup type"
 .cindex "&_/etc/passwd_&"

-&(passwd)& is a query-style lookup with queries that are just user names. The
+This is a query-style lookup with queries that are just user names. The

 lookup calls &[getpwnam()]& to interrogate the system password data, and on
 success, the result string is the same as you would get from an &(lsearch)&
 lookup on a traditional &_/etc/passwd file_&, though with &`*`& for the
 lookup calls &[getpwnam()]& to interrogate the system password data, and on
 success, the result string is the same as you would get from an &(lsearch)&
 lookup on a traditional &_/etc/passwd file_&, though with &`*`& for the


@@ -7151,32 +7141,33 @@ password value. For example:
 .code
 *:42:42:King Rat:/home/kr:/bin/bash
 .endd
 .code
 *:42:42:King Rat:/home/kr:/bin/bash
 .endd

-.next
+
+.subsection pgsql

 .cindex "PostgreSQL lookup type"
 .cindex "lookup" "PostgreSQL"
 .cindex "PostgreSQL lookup type"
 .cindex "lookup" "PostgreSQL"

-&(pgsql)&: The format of the query is an SQL statement that is passed to a
+The format of the query is an SQL statement that is passed to a

 PostgreSQL database. See section &<<SECTsql>>&.
 
 PostgreSQL database. See section &<<SECTsql>>&.
 

-.next
+.subsection redis

 .cindex "Redis lookup type"
 .cindex lookup Redis
 .cindex "Redis lookup type"
 .cindex lookup Redis

-&(redis)&: The format of the query is either a simple get or simple set,
+The format of the query is either a simple get or simple set,

 passed to a Redis database. See section &<<SECTsql>>&.
 
 passed to a Redis database. See section &<<SECTsql>>&.
 

-.next
+.subsection sqlite

 .cindex "sqlite lookup type"
 .cindex "lookup" "sqlite"
 .cindex "sqlite lookup type"
 .cindex "lookup" "sqlite"

-&(sqlite)&: The format of the query is
+The format of the query is

 an SQL statement that is passed to an SQLite database. See section &<<SECTsqlite>>&.
 
 an SQL statement that is passed to an SQLite database. See section &<<SECTsqlite>>&.
 

-.next
-&(testdb)&: This is a lookup type that is used for testing Exim. It is
+.subsection testdb
+This is a lookup type that is used for testing Exim. It is

 not likely to be useful in normal operation.
 not likely to be useful in normal operation.

-.next
+
+.subsection whoson

 .cindex "whoson lookup type"
 .cindex "lookup" "whoson"
 .cindex "whoson lookup type"
 .cindex "lookup" "whoson"

-. --- still http:-only, 2018-09-07
-&(whoson)&: &'Whoson'& (&url(http://whoson.sourceforge.net)) is a protocol that
+&'Whoson'& (&url(http://whoson.sourceforge.net)) is a protocol that

 allows a server to check whether a particular (dynamically allocated) IP
 address is currently allocated to a known (trusted) user and, optionally, to
 obtain the identity of the said user. For SMTP servers, &'Whoson'& was popular
 allows a server to check whether a particular (dynamically allocated) IP
 address is currently allocated to a known (trusted) user and, optionally, to
 obtain the identity of the said user. For SMTP servers, &'Whoson'& was popular


@@ -7191,7 +7182,6 @@ The query consists of a single IP address. The value returned is the name of
 the authenticated user, which is stored in the variable &$value$&. However, in
 this example, the data in &$value$& is not used; the result of the lookup is
 one of the fixed strings &"yes"& or &"no"&.
 the authenticated user, which is stored in the variable &$value$&. However, in
 this example, the data in &$value$& is not used; the result of the lookup is
 one of the fixed strings &"yes"& or &"no"&.

-.endlist

 
 
 
 
 
 


@@ -7359,6 +7349,11 @@ dot-separated components; a key such as &`*fict.example`&
 in a database file is useless, because the asterisk in a partial matching
 subject key is always followed by a dot.
 
 in a database file is useless, because the asterisk in a partial matching
 subject key is always followed by a dot.
 

+When the lookup is done from a string-expansion,
+the variables &$1$& and &$2$& contain the wild and non-wild parts of the key
+during the expansion of the replacement text.
+They return to their previous values at the end of the lookup item.
+

 
 
 
 
 
 


@@ -7409,10 +7404,15 @@ of the following form is provided:
 .code
 ${quote_<lookup-type>:<string>}
 .endd
 .code
 ${quote_<lookup-type>:<string>}
 .endd

-For example, the safest way to write the NIS+ query is
+For example, the way to write the NIS+ query is

 .code
 [name="${quote_nisplus:$local_part}"]
 .endd
 .code
 [name="${quote_nisplus:$local_part}"]
 .endd

+.cindex "tainted data" "in lookups"
+.new
+&*All*& tainted data used in a query-style lookup must be quoted
+using a mechanism appropriate for the lookup type.
+.wen

 See chapter &<<CHAPexpand>>& for full coverage of string expansions. The quote
 operator can be used for all lookup types, but has no effect for single-key
 lookups, since no quoting is ever needed in their key strings.
 See chapter &<<CHAPexpand>>& for full coverage of string expansions. The quote
 operator can be used for all lookup types, but has no effect for single-key
 lookups, since no quoting is ever needed in their key strings.


@@ -7897,7 +7897,8 @@ connection timeout (the system timeout is used), no user or password, no limit
 on the number of entries returned, and no time limit on queries.
 
 When a DN is quoted in the USER= setting for LDAP authentication, Exim
 on the number of entries returned, and no time limit on queries.
 
 When a DN is quoted in the USER= setting for LDAP authentication, Exim

-removes any URL quoting that it may contain before passing it LDAP. Apparently
+removes any URL quoting that it may contain before passing it to the LDAP library.
+Apparently

 some libraries do this for themselves, but some do not. Removing the URL
 quoting has two advantages:
 
 some libraries do this for themselves, but some do not. Removing the URL
 quoting has two advantages:
 


@@ -9746,7 +9747,10 @@ Example use (as an ACL modifier):
 .code
       add_header = :at_start:${authresults {$primary_hostname}}
 .endd
 .code
       add_header = :at_start:${authresults {$primary_hostname}}
 .endd

-This is safe even if no authentication results are available.
+This is safe even if no authentication results are available
+.new
+and would generally be placed in the DATA ACL.
+.wen

 
 
 .vitem "&*${certextract{*&<&'field'&>&*}{*&<&'certificate'&>&*}&&&
 
 
 .vitem "&*${certextract{*&<&'field'&>&*}{*&<&'certificate'&>&*}&&&


@@ -10004,8 +10008,12 @@ leading and trailing quotes are removed from the returned value.
 After expansion, <&'string'&> is interpreted as a list, colon-separated by
 default, but the separator can be changed in the usual way (&<<SECTlistsepchange>>&).
 For each item
 After expansion, <&'string'&> is interpreted as a list, colon-separated by
 default, but the separator can be changed in the usual way (&<<SECTlistsepchange>>&).
 For each item

-in this list, its value is place in &$item$&, and then the condition is
-evaluated. If the condition is true, &$item$& is added to the output as an
+in this list, its value is placed in &$item$&, and then the condition is
+evaluated.
+.new
+Any modification of &$value$& by this evaluation is discarded.
+.wen
+If the condition is true, &$item$& is added to the output as an

 item in a new list; if the condition is false, the item is discarded. The
 separator used for the output list is the same as the one used for the
 input, but a separator setting is not included in the output. For example:
 item in a new list; if the condition is false, the item is discarded. The
 separator used for the output list is the same as the one used for the
 input, but a separator setting is not included in the output. For example:


@@ -10013,7 +10021,8 @@ input, but a separator setting is not included in the output. For example:
 ${filter{a:b:c}{!eq{$item}{b}}}
 .endd
 yields &`a:c`&. At the end of the expansion, the value of &$item$& is restored
 ${filter{a:b:c}{!eq{$item}{b}}}
 .endd
 yields &`a:c`&. At the end of the expansion, the value of &$item$& is restored

-to what it was before. See also the &%map%& and &%reduce%& expansion items.
+to what it was before.
+See also the &%map%& and &%reduce%& expansion items.

 
 
 .vitem &*${hash{*&<&'string1'&>&*}{*&<&'string2'&>&*}{*&<&'string3'&>&*}}*&
 
 
 .vitem &*${hash{*&<&'string1'&>&*}{*&<&'string2'&>&*}{*&<&'string3'&>&*}}*&


@@ -10532,6 +10541,11 @@ Defines whether or not a write-shutdown is done on the connection after
 sending the request. Values are &"yes"& (the default) or &"no"&
 (preferred, eg. by some webservers).
 
 sending the request. Values are &"yes"& (the default) or &"no"&
 (preferred, eg. by some webservers).
 

+.next
+&*sni*&
+Controls the use of Server Name Identification on the connection.
+Any nonempty value will be the SNI sent; TLS will be forced.
+

 .next
 &*tls*&
 Controls the use of TLS on the connection.
 .next
 &*tls*&
 Controls the use of TLS on the connection.


@@ -10604,16 +10618,28 @@ At the end of a &*reduce*& expansion, the values of &$item$& and &$value$& are
 restored to what they were before. See also the &%filter%& and &%map%&
 expansion items.
 
 restored to what they were before. See also the &%filter%& and &%map%&
 expansion items.
 

+. A bit of a special-case logic error in writing an expansion;
+. probably not worth including in the mainline of documentation.
+. If only we had footnotes (the html output variant is the problem).
+.
+. .new
+. &*Note*&: if an &'expansion condition'& is used in <&'string3'&>
+. and that condition modifies &$value$&,
+. then the string expansions dependent on the condition cannot use
+. the &$value$& of the reduce iteration.
+. .wen
+

 .vitem &*$rheader_*&<&'header&~name'&>&*:*&&~or&~&*$rh_*&<&'header&~name'&>&*:*&
 This item inserts &"raw"& header lines. It is described with the &%header%&
 expansion item in section &<<SECTexpansionitems>>& above.
 
 .vitem &*$rheader_*&<&'header&~name'&>&*:*&&~or&~&*$rh_*&<&'header&~name'&>&*:*&
 This item inserts &"raw"& header lines. It is described with the &%header%&
 expansion item in section &<<SECTexpansionitems>>& above.
 

-.vitem "&*${run <&'options'&> {*&<&'command&~arg&~list'&>&*}{*&<&'string1'&>&*}&&&
+.vitem "&*${run<&'options'&> {*&<&'command&~arg&~list'&>&*}{*&<&'string1'&>&*}&&&

         {*&<&'string2'&>&*}}*&"
 .cindex "expansion" "running a command"
 .cindex "&%run%& expansion item"
 This item runs an external command, as a subprocess.
         {*&<&'string2'&>&*}}*&"
 .cindex "expansion" "running a command"
 .cindex "&%run%& expansion item"
 This item runs an external command, as a subprocess.

-One option is supported after the word &'run'&, comma-separated.
+One option is supported after the word &'run'&, comma-separated
+and without whitespace.

 
 If the option &'preexpand'& is not used,
 the command string is split into individual arguments by spaces
 
 If the option &'preexpand'& is not used,
 the command string is split into individual arguments by spaces


@@ -10673,6 +10699,7 @@ shell must be invoked directly, such as with:
 .code
 ${run{/bin/bash -c "/usr/bin/id >/tmp/id"}{yes}{yes}}
 .endd
 .code
 ${run{/bin/bash -c "/usr/bin/id >/tmp/id"}{yes}{yes}}
 .endd

+Note that &$value$& will not persist beyond the reception of a single message.

 
 .vindex "&$runrc$&"
 The return code from the command is put in the variable &$runrc$&, and this
 
 .vindex "&$runrc$&"
 The return code from the command is put in the variable &$runrc$&, and this


@@ -11095,6 +11122,24 @@ abbreviation &%h%& can be used when &%hash%& is used as an operator.
 
 
 
 
 
 

+.new
+.vitem &*${headerwrap_*&<&'cols'&>&*_*&<&'limit'&>&*:*&<&'string'&>&*}*&
+.cindex header "wrapping operator"
+.cindex expansion "header wrapping"
+This operator line-wraps its argument in a way useful for headers.
+The &'cols'& value gives the column number to wrap after,
+the &'limit'& gives a limit number of result characters to truncate at.
+Either just the &'limit'& and the preceding underbar, or both, can be omitted;
+the defaults are 80 and 998.
+Wrapping will be inserted at a space if possible before the
+column number is reached.
+Whitespace at a chosen wrap point is removed.
+A line-wrap consists of a newline followed by a tab,
+and the tab is counted as 8 columns.
+.wen
+
+
+

 .vitem &*${hex2b64:*&<&'hexstring'&>&*}*&
 .cindex "base64 encoding" "conversion from hex"
 .cindex "expansion" "hex to base64"
 .vitem &*${hex2b64:*&<&'hexstring'&>&*}*&
 .cindex "base64 encoding" "conversion from hex"
 .cindex "expansion" "hex to base64"


@@ -11756,6 +11801,7 @@ Consider using a dsearch lookup.
 .cindex "first delivery"
 .cindex "expansion" "first delivery test"
 .cindex "&%first_delivery%& expansion condition"
 .cindex "first delivery"
 .cindex "expansion" "first delivery test"
 .cindex "&%first_delivery%& expansion condition"

+.cindex retry condition

 This condition, which has no data, is true during a message's first delivery
 attempt. It is false during any subsequent delivery attempts.
 
 This condition, which has no data, is true during a message's first delivery
 attempt. It is false during any subsequent delivery attempts.
 


@@ -11783,10 +11829,11 @@ all items in the list, the overall condition is true.
 .endlist
 Note that negation of &*forany*& means that the condition must be false for all
 items for the overall condition to succeed, and negation of &*forall*& means
 .endlist
 Note that negation of &*forany*& means that the condition must be false for all
 items for the overall condition to succeed, and negation of &*forall*& means

-that the condition must be false for at least one item. In this example, the
-list separator is changed to a comma:
+that the condition must be false for at least one item.
+
+Example:

 .code
 .code

-${if forany{<, $recipients}{match{$item}{^user3@}}{yes}{no}}
+${if forany{$recipients_list}{match{$item}{^user3@}}{yes}{no}}

 .endd
 The value of &$item$& is saved and restored while &%forany%& or &%forall%& is
 being processed, to enable these expansion items to be nested.
 .endd
 The value of &$item$& is saved and restored while &%forany%& or &%forall%& is
 being processed, to enable these expansion items to be nested.


@@ -11840,8 +11887,8 @@ Case and collation order are defined per the system C locale.
 SRS decode.  See SECT &<<SECTSRS>>& for details.
 
 
 SRS decode.  See SECT &<<SECTSRS>>& for details.
 
 

-.vitem &*inlist&~{*&<&'string1'&>&*}{*&<&'string2'&>&*}*& &&&
-       &*inlisti&~{*&<&'string1'&>&*}{*&<&'string2'&>&*}*&
+.vitem &*inlist&~{*&<&'subject'&>&*}{*&<&'list'&>&*}*& &&&
+       &*inlisti&~{*&<&'subject'&>&*}{*&<&'list'&>&*}*&

 .cindex "string" "comparison"
 .cindex "list" "iterative conditions"
 Both strings are expanded; the second string is treated as a list of simple
 .cindex "string" "comparison"
 .cindex "list" "iterative conditions"
 Both strings are expanded; the second string is treated as a list of simple


@@ -12041,6 +12088,10 @@ Exim was built with the EXPAND_LISTMATCH_RHS option.
 
 Consult section &<<SECThoslispatip>>& for further details of these patterns.
 
 
 Consult section &<<SECThoslispatip>>& for further details of these patterns.
 

+The variable &$value$& will be set for a successful match and can be
+used in the success clause of an &%if%& expansion item using the condition.
+Any previous &$value$& is restored after the if.
+

 .vitem &*match_local_part&~{*&<&'string1'&>&*}{*&<&'string2'&>&*}*&
 .cindex "domain list" "in expansion condition"
 .cindex "address list" "in expansion condition"
 .vitem &*match_local_part&~{*&<&'string1'&>&*}{*&<&'string2'&>&*}*&
 .cindex "domain list" "in expansion condition"
 .cindex "address list" "in expansion condition"


@@ -13385,10 +13436,20 @@ The main use of this variable is expected to be to distinguish between
 rejections of MAIL and rejections of RCPT.
 
 .tvar &$recipients$&
 rejections of MAIL and rejections of RCPT.
 
 .tvar &$recipients$&

-This variable contains a list of envelope recipients for a message. A comma and
-a space separate the addresses in the replacement text. However, the variable
-is not generally available, to prevent exposure of Bcc recipients in
-unprivileged users' filter files. You can use &$recipients$& only in these
+.new
+.tvar &$recipients_list$&
+These variables both contain the envelope recipients for a message.
+
+The first uses a comma and a space separate the addresses in the replacement text.
+&*Note*&: an address can legitimately contain a comma;
+this variable is not intended for further processing.
+
+The second is a proper Exim list; colon-separated.
+.wen
+
+However, the variables
+are not generally available, to prevent exposure of Bcc recipients in
+unprivileged users' filter files. You can use either of them  only in these

 cases:
 
 .olist
 cases:
 
 .olist


@@ -13452,7 +13513,8 @@ This is an obsolete name for &$bounce_return_size_limit$&.
 .cindex "router" "name"
 .cindex "name" "of router"
 .vindex "&$router_name$&"
 .cindex "router" "name"
 .cindex "name" "of router"
 .vindex "&$router_name$&"

-During the running of a router this variable contains its name.
+During the running of a router, or a transport called,
+this variable contains the router name.

 
 .vitem &$runrc$&
 .cindex "return code" "from &%run%& expansion"
 
 .vitem &$runrc$&
 .cindex "return code" "from &%run%& expansion"


@@ -13743,6 +13805,11 @@ there actually are, because many other connections may come and go while a
 single connection is being processed. When a child process terminates, the
 daemon decrements its copy of the variable.
 
 single connection is being processed. When a child process terminates, the
 daemon decrements its copy of the variable.
 

+.vitem &$smtp_notquit_reason$&
+.vindex "&$smtp_notquit_reason$&"
+When the not-QUIT ACL is running, this variable is set to a string
+that indicates the reason for the termination of the SMTP connection.
+

 .vitem "&$sn0$& &-- &$sn9$&"
 These variables are copies of the values of the &$n0$& &-- &$n9$& accumulators
 that were current at the end of the system filter file. This allows a system
 .vitem "&$sn0$& &-- &$sn9$&"
 These variables are copies of the values of the &$n0$& &-- &$n9$& accumulators
 that were current at the end of the system filter file. This allows a system


@@ -15419,11 +15486,8 @@ $primary_hostname-$tod_epoch-testing
 See section &<<CALLaddparcall>>& for details of how this value is used.
 
 
 See section &<<CALLaddparcall>>& for details of how this value is used.
 
 

-.option check_log_inodes main integer 100
-See &%check_spool_space%& below.
-
-
-.option check_log_space main integer 10M
+.options check_log_inodes main integer 100 &&&
+        check_log_space main integer 10M

 See &%check_spool_space%& below.
 
 .oindex "&%check_rfc2047_length%&"
 See &%check_spool_space%& below.
 
 .oindex "&%check_rfc2047_length%&"


@@ -15438,11 +15502,8 @@ of the RFC, generates overlong encoded words. If &%check_rfc2047_length%& is
 set false, Exim recognizes encoded words of any length.
 
 
 set false, Exim recognizes encoded words of any length.
 
 

-.option check_spool_inodes main integer 100
-See &%check_spool_space%& below.
-
-
-.option check_spool_space main integer 10M
+.options check_spool_inodes main integer 100 &&&
+        check_spool_space main integer 10M

 .cindex "checking disk space"
 .cindex "disk space, checking"
 .cindex "spool directory" "checking space"
 .cindex "checking disk space"
 .cindex "disk space, checking"
 .cindex "spool directory" "checking space"


@@ -15521,17 +15582,15 @@ 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
 backward compatibility, &%daemon_smtp_port%& (singular) is a synonym.
 
 listens. See chapter &<<CHAPinterfaces>>& for details of how it is used. For
 backward compatibility, &%daemon_smtp_port%& (singular) is a synonym.
 

-.option daemon_startup_retries main integer 9
+.options daemon_startup_retries main integer 9 &&&
+        daemon_startup_sleep main time 30s

 .cindex "daemon startup, retrying"
 .cindex "daemon startup, retrying"

-This option, along with &%daemon_startup_sleep%&, controls the retrying done by
+These options control the retrying done by

 the daemon at startup when it cannot immediately bind a listening socket
 (typically because the socket is already in use): &%daemon_startup_retries%&
 defines the number of retries after the first failure, and
 &%daemon_startup_sleep%& defines the length of time to wait between retries.
 
 the daemon at startup when it cannot immediately bind a listening socket
 (typically because the socket is already in use): &%daemon_startup_retries%&
 defines the number of retries after the first failure, and
 &%daemon_startup_sleep%& defines the length of time to wait between retries.
 

-.option daemon_startup_sleep main time 30s
-See &%daemon_startup_retries%&.
-

 .option delay_warning main "time list" 24h
 .cindex "warning of delay"
 .cindex "delay warning, specifying"
 .option delay_warning main "time list" 24h
 .cindex "warning of delay"
 .cindex "delay warning, specifying"


@@ -15694,7 +15753,12 @@ by a setting such as this:
 .code
 dns_again_means_nonexist = *.in-addr.arpa
 .endd
 .code
 dns_again_means_nonexist = *.in-addr.arpa
 .endd

-This option applies to all DNS lookups that Exim does. It also applies when the
+This option applies to all DNS lookups that Exim does,
+.new
+except for TLSA lookups (where knowing about such failures
+is security-relevant).
+.wen
+It also applies when the

 &[gethostbyname()]& or &[getipnodebyname()]& functions give temporary errors,
 since these are most likely to be caused by DNS lookup problems. The
 &(dnslookup)& router has some options of its own for controlling what happens
 &[gethostbyname()]& or &[getipnodebyname()]& functions give temporary errors,
 since these are most likely to be caused by DNS lookup problems. The
 &(dnslookup)& router has some options of its own for controlling what happens


@@ -16034,6 +16098,7 @@ search the file multiple times for non-existent users, and also cause delay.
 
 .option freeze_tell main "string list, comma separated" unset
 .cindex "freezing messages" "sending a message when freezing"
 
 .option freeze_tell main "string list, comma separated" unset
 .cindex "freezing messages" "sending a message when freezing"

+.cindex "frozen messages" "sending a message when freezing"

 On encountering certain errors, or when configured to do so in a system filter,
 ACL, or special router, Exim freezes a message. This means that no further
 delivery attempts take place until an administrator thaws the message, or the
 On encountering certain errors, or when configured to do so in a system filter,
 ACL, or special router, Exim freezes a message. This means that no further
 delivery attempts take place until an administrator thaws the message, or the


@@ -16049,7 +16114,8 @@ log. If you configure freezing in a filter or ACL, you must arrange for any
 logging that you require.
 
 
 logging that you require.
 
 

-.option gecos_name main string&!! unset
+.options gecos_name main string&!! unset &&&
+        gecos_pattern main string unset

 .cindex "HP-UX"
 .cindex "&""gecos""& field, parsing"
 Some operating systems, notably HP-UX, use the &"gecos"& field in the system
 .cindex "HP-UX"
 .cindex "&""gecos""& field, parsing"
 Some operating systems, notably HP-UX, use the &"gecos"& field in the system


@@ -16074,9 +16140,6 @@ gecos_pattern = ([^,]*)
 gecos_name = $1
 .endd
 
 gecos_name = $1
 .endd
 

-.option gecos_pattern main string unset
-See &%gecos_name%& above.
-

 
 .option gnutls_compat_mode main boolean unset
 This option controls whether GnuTLS is used in compatibility mode in an Exim
 
 .option gnutls_compat_mode main boolean unset
 This option controls whether GnuTLS is used in compatibility mode in an Exim


@@ -16274,6 +16337,11 @@ 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.
 
 nowadays the ACL specified by &%acl_smtp_connect%& can also reject incoming
 connections immediately.
 

+.new
+If the connection is on a TLS-on-connect port then the TCP connection is
+just dropped.  Otherwise, an SMTP error is sent first.
+.wen
+

 The ability to give an immediate rejection (either by this option or using an
 ACL) is provided for use in unusual cases. Many hosts will just try again,
 sometimes without much delay. Normally, it is better to use an ACL to reject
 The ability to give an immediate rejection (either by this option or using an
 ACL) is provided for use in unusual cases. Many hosts will just try again,
 sometimes without much delay. Normally, it is better to use an ACL to reject


@@ -16375,7 +16443,8 @@ dealing with other kinds of frozen message, see &%auto_thaw%& and
 &%timeout_frozen_after%&.
 
 
 &%timeout_frozen_after%&.
 
 

-.option ignore_fromline_hosts main "host list&!!" unset
+.options ignore_fromline_hosts main "host list&!!" unset &&&
+        ignore_fromline_local main boolean false

 .cindex "&""From""& line"
 .cindex "UUCP" "&""From""& line"
 Some broken SMTP clients insist on sending a UUCP-like &"From&~"& line before
 .cindex "&""From""& line"
 .cindex "UUCP" "&""From""& line"
 Some broken SMTP clients insist on sending a UUCP-like &"From&~"& line before


@@ -16387,8 +16456,6 @@ process rather than a remote host, and is using &%-bs%& to inject the messages,
 &%ignore_fromline_local%& must be set to achieve this effect.
 
 
 &%ignore_fromline_local%& must be set to achieve this effect.
 
 

-.option ignore_fromline_local main boolean false
-See &%ignore_fromline_hosts%& above.

 
 .option keep_environment main "string list" unset
 .cindex "environment" "values from"
 
 .option keep_environment main "string list" unset
 .cindex "environment" "values from"


@@ -16543,7 +16610,8 @@ has more details about &'Sender:'& processing.
 
 
 
 
 
 

-.option local_from_prefix main string unset
+.options local_from_prefix main string unset &&&
+        local_from_suffix main string unset

 When Exim checks the &'From:'& header line of locally submitted messages for
 matching the login id (see &%local_from_check%& above), it can be configured to
 ignore certain prefixes and suffixes in the local part of the address. This is
 When Exim checks the &'From:'& header line of locally submitted messages for
 matching the login id (see &%local_from_check%& above), it can be configured to
 ignore certain prefixes and suffixes in the local part of the address. This is


@@ -16563,10 +16631,6 @@ matches the actual sender address that is constructed from the login name and
 qualify domain.
 
 
 qualify domain.
 
 

-.option local_from_suffix main string unset
-See &%local_from_prefix%& above.
-
-

 .option local_interfaces main "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
 .option local_interfaces main "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


@@ -17006,16 +17070,11 @@ a good idea to reject recipient addresses with percent characters in their
 local parts. Exim's default configuration does this.
 
 
 local parts. Exim's default configuration does this.
 
 

-.option perl_at_start main boolean false
+.options perl_at_start main boolean false &&&
+        perl_startup main string unset

 .cindex "Perl"
 .cindex "Perl"

-This option is available only when Exim is built with an embedded Perl
-interpreter. See chapter &<<CHAPperl>>& for details of its use.
-
-
-.option perl_startup main string unset
-.cindex "Perl"
-This option is available only when Exim is built with an embedded Perl
-interpreter. See chapter &<<CHAPperl>>& for details of its use.
+These options are available only when Exim is built with an embedded Perl
+interpreter. See chapter &<<CHAPperl>>& for details of their use.

 
 .option perl_taintmode main boolean false
 .cindex "Perl"
 
 .option perl_taintmode main boolean false
 .cindex "Perl"


@@ -17227,7 +17286,7 @@ and &%-odi%& command line options override &%queue_only%& unless
 &%queue_only_load%&, and &%smtp_accept_queue%&.
 
 
 &%queue_only_load%&, and &%smtp_accept_queue%&.
 
 

-.option queue_only_file main string unset
+.option queue_only_file main "string list" unset

 .cindex "queueing incoming messages"
 .cindex "message" "queueing by file existence"
 This option can be set to a colon-separated list of absolute path names, each
 .cindex "queueing incoming messages"
 .cindex "message" "queueing by file existence"
 This option can be set to a colon-separated list of absolute path names, each


@@ -17764,13 +17823,18 @@ This facility is only available on Linux.
 .cindex "banner for SMTP"
 .cindex "welcome banner for SMTP"
 .cindex "customizing" "SMTP banner"
 .cindex "banner for SMTP"
 .cindex "welcome banner for SMTP"
 .cindex "customizing" "SMTP banner"

-This string, which is expanded every time it is used, is output as the initial
+If a connect ACL does not supply a message,
+this string (which is expanded every time it is used) is output as the initial

 positive response to an SMTP connection. The default setting is:
 .code
 smtp_banner = $smtp_active_hostname ESMTP Exim \
   $version_number $tod_full
 .endd
 positive response to an SMTP connection. The default setting is:
 .code
 smtp_banner = $smtp_active_hostname ESMTP Exim \
   $version_number $tod_full
 .endd

-Failure to expand the string causes a panic error. If you want to create a
+.new
+Failure to expand the string causes a panic error;
+a forced fail just closes the connection.
+.wen
+If you want to create a

 multiline response to the initial SMTP connection, use &"\n"& in the string at
 appropriate points, but not at the end. Note that the 220 code is not included
 in this string. Exim adds it automatically (several times in the case of a
 multiline response to the initial SMTP connection, use &"\n"& in the string at
 appropriate points, but not at the end. Note that the 220 code is not included
 in this string. Exim adds it automatically (several times in the case of a


@@ -17905,7 +17969,9 @@ non-SMTP command lines are sent first.
 
 
 
 
 
 

-.option smtp_ratelimit_hosts main "host list&!!" unset
+.options smtp_ratelimit_hosts main "host list&!!" unset &&&
+        smtp_ratelimit_mail main string unset &&&
+        smtp_ratelimit_rcpt main string unset

 .cindex "SMTP" "rate limiting"
 .cindex "limit" "rate of message arrival"
 .cindex "RCPT" "rate limiting"
 .cindex "SMTP" "rate limiting"
 .cindex "limit" "rate of message arrival"
 .cindex "RCPT" "rate limiting"


@@ -17948,13 +18014,6 @@ 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.
 
 
 delays to RCPT commands when more than four occur in a single message.
 
 

-.option smtp_ratelimit_mail main string unset
-See &%smtp_ratelimit_hosts%& above.
-
-
-.option smtp_ratelimit_rcpt main string unset
-See &%smtp_ratelimit_hosts%& above.
-

 
 .option smtp_receive_timeout main time&!! 5m
 .cindex "timeout" "for SMTP input"
 
 .option smtp_receive_timeout main time&!! 5m
 .cindex "timeout" "for SMTP input"


@@ -18355,7 +18414,7 @@ is not required the &%tls_advertise_hosts%& option should be set empty.
 .cindex ALPN "set acceptable names for server"
 If this option is set,
 the TLS library supports ALPN,
 .cindex ALPN "set acceptable names for server"
 If this option is set,
 the TLS library supports ALPN,

-and the client offers either more than
+and the client offers either more than one

 ALPN name or a name which does not match the list,
 the TLS connection is declined.
 
 ALPN name or a name which does not match the list,
 the TLS connection is declined.
 


@@ -18512,20 +18571,27 @@ prior to the 4.80 release, as Debian used to patch Exim to raise the minimum
 acceptable bound from 1024 to 2048.
 
 
 acceptable bound from 1024 to 2048.
 
 

-.option tls_eccurve main string&!! &`auto`&
+.option tls_eccurve main string list&!! &`auto`&

 .cindex TLS "EC cryptography"
 .cindex TLS "EC cryptography"

-This option selects a EC curve for use by Exim when used with OpenSSL.
-It has no effect when Exim is used with GnuTLS.
+This option selects EC curves for use by Exim when used with OpenSSL.
+It has no effect when Exim is used with GnuTLS
+(the equivalent can be done using a priority string for the
+&%tls_require_ciphers%& option).

 
 

-After expansion it must contain a valid EC curve parameter, such as
-&`prime256v1`&, &`secp384r1`&, or &`P-512`&. Consult your OpenSSL manual
-for valid selections.
+After expansion it must contain
+.new
+one or (only for OpenSSL versiona 1.1.1 onwards) more
+.wen
+EC curve names, such as &`prime256v1`&, &`secp384r1`&, or &`P-521`&.
+Consult your OpenSSL manual for valid curve names.

 
 For OpenSSL versions before (and not including) 1.0.2, the string
 &`auto`& selects &`prime256v1`&. For more recent OpenSSL versions
 &`auto`& tells the library to choose.
 
 
 For OpenSSL versions before (and not including) 1.0.2, the string
 &`auto`& selects &`prime256v1`&. For more recent OpenSSL versions
 &`auto`& tells the library to choose.
 

-If the option expands to an empty string, no EC curves will be enabled.
+.new
+If the option expands to an empty string, the effect is undefined.
+.wen

 
 
 .option tls_ocsp_file main string&!! unset
 
 
 .option tls_ocsp_file main string&!! unset


@@ -19119,12 +19185,25 @@ This applies to all of the SRV, MX, AAAA, A lookup sequence.
 .cindex "router" "restricting to specific domains"
 .vindex "&$domain_data$&"
 If this option is set, the router is skipped unless the current domain matches
 .cindex "router" "restricting to specific domains"
 .vindex "&$domain_data$&"
 If this option is set, the router is skipped unless the current domain matches

-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
+the list.
+The data returned by the list check
+is placed in &$domain_data$& for use in string

 expansions of the driver's private options and in the transport.
 See section &<<SECTrouprecon>>& for
 a list of the order in which preconditions are evaluated.
 
 expansions of the driver's private options and in the transport.
 See section &<<SECTrouprecon>>& for
 a list of the order in which preconditions are evaluated.
 

+A complex example, using a file like:
+.code
+alice@dom1
+bill@dom1
+maggie@dom1
+.endd
+and checking both domain and local_part
+.code
+domains =         ${domain:${lookup {$local_part@$domain} lseach,ret=key {/path/to/accountsfile}}}
+local_parts = ${local_part:${lookup {$local_part@$domain} lseach,ret=key {/path/to/accountsfile}}}
+.endd
+

 
 
 .option driver routers string unset
 
 
 .option driver routers string unset


@@ -19488,7 +19567,7 @@ example:
 local_parts = dbm;/usr/local/specials/$domain_data
 .endd
 .vindex "&$local_part_data$&"
 local_parts = dbm;/usr/local/specials/$domain_data
 .endd
 .vindex "&$local_part_data$&"

-If the match is achieved by a lookup, the data that the lookup returned
+the data returned by the list check

 for the local part is placed in the variable &$local_part_data$& for use in
 expansions of the router's private options or in the transport.
 You might use this option, for
 for the local part is placed in the variable &$local_part_data$& for use in
 expansions of the router's private options or in the transport.
 You might use this option, for


@@ -22460,7 +22539,7 @@ its removal from incoming messages, so that delivered messages can safely be
 resent to other recipients.
 
 &*Note:*& If used on a transport handling multiple recipients
 resent to other recipients.
 
 &*Note:*& If used on a transport handling multiple recipients

-(the smtp transport unless &%rcpt_max%& is 1, the appendfile, pipe or lmtp
+(the smtp transport unless &%max_rcpt%& is 1, the appendfile, pipe or lmtp

 transport if &%batch_max%& is greater than 1)
 then information about Bcc recipients will be leaked.
 Doing so is generally not advised.
 transport if &%batch_max%& is greater than 1)
 then information about Bcc recipients will be leaked.
 Doing so is generally not advised.


@@ -22824,7 +22903,17 @@ example:
 transport_filter = '/bin/cmd${if eq{$host}{a.b.c}{1}{2}}'
 .endd
 This runs the command &(/bin/cmd1)& if the host name is &'a.b.c'&, and
 transport_filter = '/bin/cmd${if eq{$host}{a.b.c}{1}{2}}'
 .endd
 This runs the command &(/bin/cmd1)& if the host name is &'a.b.c'&, and

-&(/bin/cmd2)& otherwise. If double quotes had been used, they would have been
+&(/bin/cmd2)& otherwise.
+
+Option strings in general have any fully-surrounding double quote wrapping
+removed early in parsing (see &<<SECTstrings>>&).
+Then, for this option, quotes protect against whitespace being
+regarded as a separator while splitting into the command argument vector.
+Either double or single quotes can be used here;
+the former interprets backlash-quoted charachters
+and the latter does not.
+
+If double quotes had been used in this example, they would have been

 stripped by Exim when it read the option's value. When the value is used, if
 the single quotes were missing, the line would be split into two items,
 &`/bin/cmd${if`& and &`eq{$host}{a.b.c}{1}{2}`&, and an error would occur when
 stripped by Exim when it read the option's value. When the value is used, if
 the single quotes were missing, the line would be split into two items,
 &`/bin/cmd${if`& and &`eq{$host}{a.b.c}{1}{2}`&, and an error would occur when


@@ -25688,12 +25777,18 @@ hard failure if required. See also &%hosts_try_auth%&, and chapter
 &<<CHAPSMTPAUTH>>& for details of authentication.
 
 
 &<<CHAPSMTPAUTH>>& for details of authentication.
 
 

-.option hosts_request_ocsp smtp "host list&!!" *
+.option hosts_request_ocsp smtp "host list&!!" "see below"

 .cindex "TLS" "requiring for certain servers"
 Exim will request a Certificate Status on a
 TLS session for any host that matches this list.
 &%tls_verify_certificates%& should also be set for the transport.
 
 .cindex "TLS" "requiring for certain servers"
 Exim will request a Certificate Status on a
 TLS session for any host that matches this list.
 &%tls_verify_certificates%& should also be set for the transport.
 

+.new
+The default is &"**"& if DANE is not in use for the connection,
+or if DANE-TA us used.
+It is empty if DANE-EE is used.
+.wen
+

 .option hosts_require_alpn smtp "host list&!!" unset
 .cindex ALPN "require negotiation in client"
 .cindex TLS ALPN
 .option hosts_require_alpn smtp "host list&!!" unset
 .cindex ALPN "require negotiation in client"
 .cindex TLS ALPN


@@ -25835,12 +25930,22 @@ If this option is set true when the &%protocol%& option is set to &"lmtp"&, the
 string &`IGNOREQUOTA`& is added to RCPT commands, provided that the LMTP server
 has advertised support for IGNOREQUOTA in its response to the LHLO command.
 
 string &`IGNOREQUOTA`& is added to RCPT commands, provided that the LMTP server
 has advertised support for IGNOREQUOTA in its response to the LHLO command.
 

-.option max_rcpt smtp integer 100
+.option max_rcpt smtp integer&!! 100

 .cindex "RCPT" "maximum number of outgoing"
 .cindex "RCPT" "maximum number of outgoing"

-This option limits the number of RCPT commands that are sent in a single
-SMTP message transaction. Each set of addresses is treated independently, and
+This option,
+.new
+after expansion,
+.wen
+limits the number of RCPT commands that are sent in a single
+SMTP message transaction.
+A value setting of zero disables the limit.
+
+.new
+If a constant is given,
+.wen
+each set of addresses is treated independently, and

 so can cause parallel connections to the same host if &%remote_max_parallel%&
 so can cause parallel connections to the same host if &%remote_max_parallel%&

-permits this. A value setting of zero disables the limit.
+permits this.

 
 
 .option message_linelength_limit smtp integer 998
 
 
 .option message_linelength_limit smtp integer 998


@@ -26113,7 +26218,8 @@ This option give a list of hosts for which,
 while verifying the server certificate,
 checks will be included on the host name
 (note that this will generally be the result of a DNS MX lookup)
 while verifying the server certificate,
 checks will be included on the host name
 (note that this will generally be the result of a DNS MX lookup)

-versus Subject and Subject-Alternate-Name fields.  Wildcard names are permitted
+versus the Subject-Alternate-Name (or, if none, Subject-Name) fields.
+Wildcard names are permitted,

 limited to being the initial component of a 3-or-more component FQDN.
 
 There is no equivalent checking on client certificates.
 limited to being the initial component of a 3-or-more component FQDN.
 
 There is no equivalent checking on client certificates.


@@ -26163,7 +26269,7 @@ If both this option and &%tls_try_verify_hosts%& are unset
 operation is as if this option selected all hosts.
 &*Warning*&: Including a host in &%tls_verify_hosts%& does not require
 that connections use TLS.
 operation is as if this option selected all hosts.
 &*Warning*&: Including a host in &%tls_verify_hosts%& does not require
 that connections use TLS.

-Fallback to in-clear communication will be done unless restricted by 
+Fallback to in-clear communication will be done unless restricted by

 the &%hosts_require_tls%& option.
 
 .option utf8_downconvert smtp integer&!! -1
 the &%hosts_require_tls%& option.
 
 .option utf8_downconvert smtp integer&!! -1


@@ -27648,13 +27754,15 @@ Successful authentication sets up information used by the
 &%authresults%& expansion item.
 
 .new
 &%authresults%& expansion item.
 
 .new

-.cindex authentication "failure event"
+.cindex authentication "failure event, server"

 If an authenticator is run and does not succeed,
 an event (see &<<CHAPevents>>&) of type "auth:fail" is raised.
 While the event is being processed the variables
 &$sender_host_authenticated$& (with the authenticator name)
 If an authenticator is run and does not succeed,
 an event (see &<<CHAPevents>>&) of type "auth:fail" is raised.
 While the event is being processed the variables
 &$sender_host_authenticated$& (with the authenticator name)

-and &$authenticated_fail_id$& (as set by the suthenticator &%server_set_id%& option)
+and &$authenticated_fail_id$& (as set by the authenticator &%server_set_id%& option)

 will be valid.
 will be valid.

+If the event is serviced and a string is returned then the string will be logged
+instead of the default log line.

 See <<CHAPevents>> for details on events.
 .wen
 
 See <<CHAPevents>> for details on events.
 .wen
 


@@ -27734,6 +27842,19 @@ If the result of the authentication attempt is a temporary error or a timeout,
 Exim abandons trying to send the message to the host for the moment. It will
 try again later. If there are any backup hosts available, they are tried in the
 usual way.
 Exim abandons trying to send the message to the host for the moment. It will
 try again later. If there are any backup hosts available, they are tried in the
 usual way.

+
+.new
+.next
+.cindex authentication "failure event, client"
+If the response to authentication is a permanent error (5&'xx'& code),
+an event (see &<<CHAPevents>>&) of type "auth:fail" is raised.
+While the event is being processed the variable
+&$sender_host_authenticated$& (with the authenticator name)
+will be valid.
+If the event is serviced and a string is returned then the string will be logged.
+See <<CHAPevents>> for details on events.
+.wen
+

 .next
 If the response to authentication is a permanent error (5&'xx'& code), Exim
 carries on searching the list of authenticators and tries another one if
 .next
 If the response to authentication is a permanent error (5&'xx'& code), Exim
 carries on searching the list of authenticators and tries another one if


@@ -28289,7 +28410,7 @@ Dovecot 2 POP/IMAP server, which can support a number of authentication methods.
 Note that Dovecot must be configured to use auth-client not auth-userdb.
 If you are using Dovecot to authenticate POP/IMAP clients, it might be helpful
 to use the same mechanisms for SMTP authentication. This is a server
 Note that Dovecot must be configured to use auth-client not auth-userdb.
 If you are using Dovecot to authenticate POP/IMAP clients, it might be helpful
 to use the same mechanisms for SMTP authentication. This is a server

-authenticator only. There is only one option:
+authenticator only. There is only one non-generic option:

 
 .option server_socket dovecot string unset
 
 
 .option server_socket dovecot string unset
 


@@ -28301,6 +28422,7 @@ authenticators for different mechanisms. For example:
 dovecot_plain:
   driver = dovecot
   public_name = PLAIN
 dovecot_plain:
   driver = dovecot
   public_name = PLAIN

+  server_advertise_condition = ${if def:tls_in_cipher}

   server_socket = /var/run/dovecot/auth-client
   server_set_id = $auth1
 
   server_socket = /var/run/dovecot/auth-client
   server_set_id = $auth1
 


@@ -28310,6 +28432,13 @@ dovecot_ntlm:
   server_socket = /var/run/dovecot/auth-client
   server_set_id = $auth1
 .endd
   server_socket = /var/run/dovecot/auth-client
   server_set_id = $auth1
 .endd

+
+.new
+&*Note*&: plaintext authentication methods such as PLAIN and LOGIN
+should not be advertised on cleartext SMTP connections.
+See the discussion in section &<<SECTplain_TLS>>&.
+.wen
+

 If the SMTP connection is encrypted, or if &$sender_host_address$& is equal to
 &$received_ip_address$& (that is, the connection is local), the &"secured"&
 option is passed in the Dovecot authentication command. If, for a TLS
 If the SMTP connection is encrypted, or if &$sender_host_address$& is equal to
 &$received_ip_address$& (that is, the connection is local), the &"secured"&
 option is passed in the Dovecot authentication command. If, for a TLS


@@ -28908,9 +29037,10 @@ for which it must have been requested via the
 (see &<<CHAPTLS>>&).
 
 If an authenticator of this type is configured it is
 (see &<<CHAPTLS>>&).
 
 If an authenticator of this type is configured it is

-run before any SMTP-level communication is done,
+run immediately after a TLS connection being negotiated
+(due to either STARTTLS or TLS-on-connect)

 and can authenticate the connection.
 and can authenticate the connection.

-If it does, SMTP authentication is not offered.
+If it does, SMTP authentication is not subsequently offered.

 
 A maximum of one authenticator of this type may be present.
 
 
 A maximum of one authenticator of this type may be present.
 


@@ -29468,7 +29598,7 @@ For outgoing SMTP deliveries, &$tls_out_cipher$& is used and logged
 (again depending on the &%tls_cipher%& log selector).
 
 
 (again depending on the &%tls_cipher%& log selector).
 
 

-.subsection "Requesting and verifying client certificates" SECID183
+.subsection "Requesting and verifying client certificates"

 .cindex "certificate" "verification of client"
 .cindex "TLS" "client certificate verification"
 If you want an Exim server to request a certificate when negotiating a TLS
 .cindex "certificate" "verification of client"
 .cindex "TLS" "client certificate verification"
 If you want an Exim server to request a certificate when negotiating a TLS


@@ -29521,86 +29651,7 @@ Because it is often a long text string, it is not included in the log line or
 certificate is supplied, &$tls_in_peerdn$& is empty.
 
 
 certificate is supplied, &$tls_in_peerdn$& is empty.
 
 

-.section "Revoked certificates" "SECID184"
-.cindex "TLS" "revoked certificates"
-.cindex "revocation list"
-.cindex "certificate" "revocation list"
-.cindex "OCSP" "stapling"
-Certificate issuing authorities issue Certificate Revocation Lists (CRLs) when
-certificates are revoked. If you have such a list, you can pass it to an Exim
-server using the global option called &%tls_crl%& and to an Exim client using
-an 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.
-The downside is that clients have to periodically re-download a potentially huge
-file from every certificate authority they know of.
-
-The way with most moving parts at query time is Online Certificate
-Status Protocol (OCSP), where the client verifies the certificate
-against an OCSP server run by the CA.  This lets the CA track all
-usage of the certs.  It requires running software with access to the
-private key of the CA, to sign the responses to the OCSP queries.  OCSP
-is based on HTTP and can be proxied accordingly.
-
-The only widespread OCSP server implementation (known to this writer)
-comes as part of OpenSSL and aborts on an invalid request, such as
-connecting to the port and then disconnecting.  This requires
-re-entering the passphrase each time some random client does this.
-
-The third way is OCSP Stapling; in this, the server using a certificate
-issued by the CA periodically requests an OCSP proof of validity from
-the OCSP server, then serves it up inline as part of the TLS
-negotiation.   This approach adds no extra round trips, does not let the
-CA track users, scales well with number of certs issued by the CA and is
-resilient to temporary OCSP server failures, as long as the server
-starts retrying to fetch an OCSP proof some time before its current
-proof expires.  The downside is that it requires server support.
-
-Unless Exim is built with the support disabled,
-or with GnuTLS earlier than version 3.3.16 / 3.4.8
-support for OCSP stapling is included.
-
-There is a global option called &%tls_ocsp_file%&.
-The file specified therein is expected to be in DER format, and contain
-an OCSP proof.  Exim will serve it as part of the TLS handshake.  This
-option will be re-expanded for SNI, if the &%tls_certificate%& option
-contains &`tls_in_sni`&, as per other TLS options.
-
-Exim does not at this time implement any support for fetching a new OCSP
-proof.  The burden is on the administrator to handle this, outside of
-Exim.  The file specified should be replaced atomically, so that the
-contents are always valid.  Exim will expand the &%tls_ocsp_file%& option
-on each connection, so a new file will be handled transparently on the
-next connection.
-
-When built with OpenSSL Exim will check for a valid next update timestamp
-in the OCSP proof; if not present, or if the proof has expired, it will be
-ignored.
-
-For the client to be able to verify the stapled OCSP the server must
-also supply, in its stapled information, any intermediate
-certificates for the chain leading to the OCSP proof from the signer
-of the server certificate.  There may be zero or one such. These
-intermediate certificates should be added to the server OCSP stapling
-file named by &%tls_ocsp_file%&.
-
-Note that the proof only covers the terminal server certificate,
-not any of the chain from CA to it.
-
-There is no current way to staple a proof for a client certificate.
-
-.code
-  A helper script "ocsp_fetch.pl" for fetching a proof from a CA
-  OCSP server is supplied.  The server URL may be included in the
-  server certificate, if the CA is helpful.
-
-  One failure mode seen was the OCSP Signer cert expiring before the end
-  of validity of the OCSP proof. The checking done by Exim/OpenSSL
-  noted this as invalid overall, but the re-fetch script did not.
-.endd
-
-
-.section "Caching of static server configuration items" "SECTserverTLScache"
+.subsection "Caching of static server configuration items" "SSECTserverTLScache"

 .cindex certificate caching
 .cindex privatekey caching
 .cindex crl caching
 .cindex certificate caching
 .cindex privatekey caching
 .cindex crl caching


@@ -29646,10 +29697,10 @@ A HUP signal is sufficient for this.
 The value &"system"& results in no caching under GnuTLS.
 
 The macro _HAVE_TLS_CA_CACHE will be defined if the suffix for "system"
 The value &"system"& results in no caching under GnuTLS.
 
 The macro _HAVE_TLS_CA_CACHE will be defined if the suffix for "system"

-is acceptable in configurations for the Exim executavble.
+is acceptable in configurations for the Exim executable.

 
 Caching of the system Certificate Authorities bundle can
 
 Caching of the system Certificate Authorities bundle can

-save siginificant time and processing on every TLS connection
+save significant time and processing on every TLS connection

 accepted by Exim.
 
 
 accepted by Exim.
 
 


@@ -29819,10 +29870,10 @@ A HUP signal is sufficient for this.
 The value &"system"& results in no caching under GnuTLS.
 
 The macro _HAVE_TLS_CA_CACHE will be defined if the suffix for "system"
 The value &"system"& results in no caching under GnuTLS.
 
 The macro _HAVE_TLS_CA_CACHE will be defined if the suffix for "system"

-is acceptable in configurations for the Exim executavble.
+is acceptable in configurations for the Exim executable.

 
 Caching of the system Certificate Authorities bundle can
 
 Caching of the system Certificate Authorities bundle can

-save siginificant time and processing on every TLS connection
+save significant time and processing on every TLS connection

 initiated by Exim.
 
 
 initiated by Exim.
 
 


@@ -29906,6 +29957,7 @@ When Exim is built against GnuTLS, SNI support is available as of GnuTLS
 0.5.10.  (Its presence predates the current API which Exim uses, so if Exim
 built, then you have SNI support).
 
 0.5.10.  (Its presence predates the current API which Exim uses, so if Exim
 built, then you have SNI support).
 

+.subsection ALPN

 .cindex TLS ALPN
 .cindex ALPN "general information"
 .cindex TLS "Application Layer Protocol Names"
 .cindex TLS ALPN
 .cindex ALPN "general information"
 .cindex TLS "Application Layer Protocol Names"


@@ -29916,7 +29968,7 @@ connection.
 The client for the connection proposes a set of protocol names, and
 the server responds with a selected one.
 It is not, as of 2021, commonly used for SMTP connections.
 The client for the connection proposes a set of protocol names, and
 the server responds with a selected one.
 It is not, as of 2021, commonly used for SMTP connections.

-However, to guard against misirected or malicious use of web clients
+However, to guard against misdirected or malicious use of web clients

 (which often do use ALPN) against MTA ports, Exim by default check that
 there is no incompatible ALPN specified by a client for a TLS connection.
 If there is, the connection is rejected.
 (which often do use ALPN) against MTA ports, Exim by default check that
 there is no incompatible ALPN specified by a client for a TLS connection.
 If there is, the connection is rejected.


@@ -29926,7 +29978,7 @@ The behaviour of both client and server can be configured using the options
 &%tls_alpn%& and &%hosts_require_alpn%&.
 There are no variables providing observability.
 Some feature-specific logging may appear on denied connections, but this
 &%tls_alpn%& and &%hosts_require_alpn%&.
 There are no variables providing observability.
 Some feature-specific logging may appear on denied connections, but this

-depends on the behavious of the peer
+depends on the behaviour of the peer

 (not all peers can send a feature-specific TLS Alert).
 
 This feature is available when Exim is built with
 (not all peers can send a feature-specific TLS Alert).
 
 This feature is available when Exim is built with


@@ -30075,6 +30127,94 @@ For information on creating self-signed CA certificates and using them to sign
 user certificates, see the &'General implementation overview'& chapter of the
 Open-source PKI book, available online at
 &url(https://sourceforge.net/projects/ospkibook/).
 user certificates, see the &'General implementation overview'& chapter of the
 Open-source PKI book, available online at
 &url(https://sourceforge.net/projects/ospkibook/).

+
+
+.subsection "Revoked certificates"
+.cindex "TLS" "revoked certificates"
+.cindex "revocation list"
+.cindex "certificate" "revocation list"
+.cindex "OCSP" "stapling"
+There are three ways for a certificate to be made unusable
+before its expiry.
+
+.ilist
+Certificate issuing authorities issue Certificate Revocation Lists (CRLs) when
+certificates are revoked. If you have such a list, you can pass it to an Exim
+server using the global option called &%tls_crl%& and to an Exim client using
+an 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.
+The downside is that clients have to periodically re-download a potentially huge
+file from every certificate authority they know of.
+
+.next
+The way with most moving parts at query time is Online Certificate
+Status Protocol (OCSP), where the client verifies the certificate
+against an OCSP server run by the CA.  This lets the CA track all
+usage of the certs.  It requires running software with access to the
+private key of the CA, to sign the responses to the OCSP queries.  OCSP
+is based on HTTP and can be proxied accordingly.
+
+The only widespread OCSP server implementation (known to this writer)
+comes as part of OpenSSL and aborts on an invalid request, such as
+connecting to the port and then disconnecting.  This requires
+re-entering the passphrase each time some random client does this.
+
+.next
+The third way is OCSP Stapling; in this, the server using a certificate
+issued by the CA periodically requests an OCSP proof of validity from
+the OCSP server, then serves it up inline as part of the TLS
+negotiation.   This approach adds no extra round trips, does not let the
+CA track users, scales well with number of certs issued by the CA and is
+resilient to temporary OCSP server failures, as long as the server
+starts retrying to fetch an OCSP proof some time before its current
+proof expires.  The downside is that it requires server support.
+
+Unless Exim is built with the support disabled,
+or with GnuTLS earlier than version 3.3.16 / 3.4.8
+support for OCSP stapling is included.
+
+There is a global option called &%tls_ocsp_file%&.
+The file specified therein is expected to be in DER format, and contain
+an OCSP proof.  Exim will serve it as part of the TLS handshake.  This
+option will be re-expanded for SNI, if the &%tls_certificate%& option
+contains &`tls_in_sni`&, as per other TLS options.
+
+Exim does not at this time implement any support for fetching a new OCSP
+proof.  The burden is on the administrator to handle this, outside of
+Exim.  The file specified should be replaced atomically, so that the
+contents are always valid.  Exim will expand the &%tls_ocsp_file%& option
+on each connection, so a new file will be handled transparently on the
+next connection.
+
+When built with OpenSSL Exim will check for a valid next update timestamp
+in the OCSP proof; if not present, or if the proof has expired, it will be
+ignored.
+
+For the client to be able to verify the stapled OCSP the server must
+also supply, in its stapled information, any intermediate
+certificates for the chain leading to the OCSP proof from the signer
+of the server certificate.  There may be zero or one such. These
+intermediate certificates should be added to the server OCSP stapling
+file named by &%tls_ocsp_file%&.
+
+Note that the proof only covers the terminal server certificate,
+not any of the chain from CA to it.
+
+There is no current way to staple a proof for a client certificate.
+
+.code
+  A helper script "ocsp_fetch.pl" for fetching a proof from a CA
+  OCSP server is supplied.  The server URL may be included in the
+  server certificate, if the CA is helpful.
+
+  One failure mode seen was the OCSP Signer cert expiring before the end
+  of validity of the OCSP proof. The checking done by Exim/OpenSSL
+  noted this as invalid overall, but the re-fetch script did not.
+.endd
+.endlist
+
+

 .ecindex IIDencsmtp1
 .ecindex IIDencsmtp2
 
 .ecindex IIDencsmtp1
 .ecindex IIDencsmtp2
 


@@ -30192,18 +30332,24 @@ DANE scales better than having to maintain (and communicate via side-channel) co
 for every possible target server.  It also scales (slightly) better than having to maintain on an SMTP
 client a copy of the standard CAs bundle.  It also means not having to pay a CA for certificates.
 
 for every possible target server.  It also scales (slightly) better than having to maintain on an SMTP
 client a copy of the standard CAs bundle.  It also means not having to pay a CA for certificates.
 

-DANE requires a server operator to do three things: 1) run DNSSEC.  This provides assurance to clients
+DANE requires a server operator to do three things:
+.olist
+Run DNSSEC.  This provides assurance to clients

 that DNS lookups they do for the server have not been tampered with.  The domain MX record applying
 to this server, its A record, its TLSA record and any associated CNAME records must all be covered by
 DNSSEC.
 that DNS lookups they do for the server have not been tampered with.  The domain MX record applying
 to this server, its A record, its TLSA record and any associated CNAME records must all be covered by
 DNSSEC.

-2) add TLSA DNS records.  These say what the server certificate for a TLS connection should be.
-3) offer a server certificate, or certificate chain, in TLS connections which is is anchored by one of the TLSA records.
+.next
+Add TLSA DNS records.  These say what the server certificate for a TLS connection should be.
+.next
+Offer a server certificate, or certificate chain, in TLS connections which is is anchored by one of the TLSA records.
+.endlist

 
 There are no changes to Exim specific to server-side operation of DANE.
 Support for client-side operation of DANE can be included at compile time by defining SUPPORT_DANE=yes
 in &_Local/Makefile_&.
 If it has been included, the macro "_HAVE_DANE" will be defined.
 
 
 There are no changes to Exim specific to server-side operation of DANE.
 Support for client-side operation of DANE can be included at compile time by defining SUPPORT_DANE=yes
 in &_Local/Makefile_&.
 If it has been included, the macro "_HAVE_DANE" will be defined.
 

+.subsection "DNS records"

 A TLSA record consist of 4 fields, the "Certificate Usage", the
 "Selector", the "Matching type", and the "Certificate Association Data".
 For a detailed description of the TLSA record see
 A TLSA record consist of 4 fields, the "Certificate Usage", the
 "Selector", the "Matching type", and the "Certificate Association Data".
 For a detailed description of the TLSA record see


@@ -30284,6 +30430,7 @@ libraries.
 This means no MD5 and no SHA-1.  SHA2-256 is the minimum for reliable
 interoperability (and probably the maximum too, in 2018).
 
 This means no MD5 and no SHA-1.  SHA2-256 is the minimum for reliable
 interoperability (and probably the maximum too, in 2018).
 

+.subsection "Interaction with OCSP"

 The use of OCSP-stapling should be considered, allowing for fast revocation of certificates (which would otherwise
 be limited by the DNS TTL on the TLSA records).  However, this is likely to only be usable with DANE-TA.  NOTE: the
 default of requesting OCSP for all hosts is modified iff DANE is in use, to:
 The use of OCSP-stapling should be considered, allowing for fast revocation of certificates (which would otherwise
 be limited by the DNS TTL on the TLSA records).  However, this is likely to only be usable with DANE-TA.  NOTE: the
 default of requesting OCSP for all hosts is modified iff DANE is in use, to:


@@ -30304,6 +30451,7 @@ This modification of hosts_request_ocsp is only done if it has the default value
 those who use &%hosts_require_ocsp%&, should consider the interaction with DANE in their OCSP settings.
 
 
 those who use &%hosts_require_ocsp%&, should consider the interaction with DANE in their OCSP settings.
 
 

+.subsection "Client configuration"

 For client-side DANE there are three new smtp transport options, &%hosts_try_dane%&, &%hosts_require_dane%&
 and &%dane_require_tls_ciphers%&.
 The &"require"& variant will result in failure if the target host is not
 For client-side DANE there are three new smtp transport options, &%hosts_try_dane%&, &%hosts_require_dane%&
 and &%dane_require_tls_ciphers%&.
 The &"require"& variant will result in failure if the target host is not


@@ -30342,6 +30490,7 @@ verification evaluation is wanted, the above variables should be set appropriate
 The router and transport option &%dnssec_request_domains%& must not be
 set to &"never"&, and &%dnssec_require_domains%& is ignored.
 
 The router and transport option &%dnssec_request_domains%& must not be
 set to &"never"&, and &%dnssec_require_domains%& is ignored.
 

+.subsection Observability

 If verification was successful using DANE then the "CV" item in the delivery log line will show as "CV=dane".
 
 There is a new variable &$tls_out_dane$& which will have "yes" if
 If verification was successful using DANE then the "CV" item in the delivery log line will show as "CV=dane".
 
 There is a new variable &$tls_out_dane$& which will have "yes" if


@@ -30357,11 +30506,13 @@ required.  This is intended to support TLS-reporting as defined in
 The &$event_data$& will be one of the Result Types defined in
 Section 4.3 of that document.
 
 The &$event_data$& will be one of the Result Types defined in
 Section 4.3 of that document.
 

+.subsection General

 Under GnuTLS, DANE is only supported from version 3.0.0 onwards.
 
 DANE is specified in published RFCs and decouples certificate authority trust
 selection from a "race to the bottom" of "you must trust everything for mail
 Under GnuTLS, DANE is only supported from version 3.0.0 onwards.
 
 DANE is specified in published RFCs and decouples certificate authority trust
 selection from a "race to the bottom" of "you must trust everything for mail

-to get through".  There is an alternative technology called MTA-STS, which
+to get through".
+There is an alternative technology called MTA-STS, which

 instead publishes MX trust anchor information on an HTTPS website.  At the
 time this text was last updated, MTA-STS was still a draft, not yet an RFC.
 Exim has no support for MTA-STS as a client, but Exim mail server operators
 instead publishes MX trust anchor information on an HTTPS website.  At the
 time this text was last updated, MTA-STS was still a draft, not yet an RFC.
 Exim has no support for MTA-STS as a client, but Exim mail server operators


@@ -30519,8 +30670,11 @@ accepted by an &%accept%& verb that has a &%message%& modifier, the contents of
 the message override the banner message that is otherwise specified by the
 &%smtp_banner%& option.
 
 the message override the banner message that is otherwise specified by the
 &%smtp_banner%& option.
 

-For tls-on-connect connections, the ACL is run after the TLS connection
-is accepted (however, &%host_reject_connection%& is tested before).
+.new
+For tls-on-connect connections, the ACL is run before the TLS connection
+is accepted; if the ACL does not accept then the TCP connection is dropped without
+any TLS startup attempt and without any SMTP response being transmitted.
+.wen

 
 
 .subsection "The EHLO/HELO ACL" SECID192
 
 
 .subsection "The EHLO/HELO ACL" SECID192


@@ -31446,8 +31600,11 @@ the message modifier cannot override the 221 response code.
 
 The text in a &%message%& modifier is literal; any quotes are taken as
 literals, but because the string is expanded, backslash escapes are processed
 
 The text in a &%message%& modifier 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
+anyway.
+If the message contains newlines, this gives rise to a multi-line SMTP

 response.
 response.

+A long message line will also be split into multi-line SMTP responses,
+on word boundaries if possible.

 
 .vindex "&$acl_verify_message$&"
 While the text is being expanded, the &$acl_verify_message$& variable
 
 .vindex "&$acl_verify_message$&"
 While the text is being expanded, the &$acl_verify_message$& variable


@@ -31671,7 +31828,7 @@ pretrigger=<&'size'&>    This option specifies a memory buffuer to be used
                      immediate writes to file are done as normal.
 
 trigger=<&'reason'&>     This option selects cause for the pretrigger buffer
                      immediate writes to file are done as normal.
 
 trigger=<&'reason'&>     This option selects cause for the pretrigger buffer

-                     see above) to be copied to file.  A reason of $*now*
+                     see above) to be copied to file.  A reason of &*now*&

                      take effect immediately; one of &*paniclog*& triggers
                      on a write to the panic log.
 .endd
                      take effect immediately; one of &*paniclog*& triggers
                      on a write to the panic log.
 .endd


@@ -31741,6 +31898,7 @@ work with.
 .vitem &*control&~=&~fakedefer/*&<&'message'&>
 .cindex "fake defer"
 .cindex "defer, fake"
 .vitem &*control&~=&~fakedefer/*&<&'message'&>
 .cindex "fake defer"
 .cindex "defer, fake"

+.cindex fakedefer

 This control works in exactly the same way as &%fakereject%& (described below)
 except that it causes an SMTP 450 response after the message data instead of a
 550 response. You must take care when using &%fakedefer%& because it causes the
 This control works in exactly the same way as &%fakereject%& (described below)
 except that it causes an SMTP 450 response after the message data instead of a
 550 response. You must take care when using &%fakedefer%& because it causes the


@@ -31750,6 +31908,7 @@ use &%fakedefer%& if the message is to be delivered normally.
 .vitem &*control&~=&~fakereject/*&<&'message'&>
 .cindex "fake rejection"
 .cindex "rejection, fake"
 .vitem &*control&~=&~fakereject/*&<&'message'&>
 .cindex "fake rejection"
 .cindex "rejection, fake"

+.cindex fakereject

 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.
 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.


@@ -32051,8 +32210,24 @@ Headers will not be removed from the message if the modifier is used in
 DATA, MIME or DKIM ACLs for a message delivered by cutthrough routing.
 
 More than one header can be removed at the same time by using a colon separated
 DATA, MIME or DKIM ACLs for a message delivered by cutthrough routing.
 
 More than one header can be removed at the same time by using a colon separated

-list of header names. The header matching is case insensitive. Wildcards are
-not permitted, nor is list expansion performed, so you cannot use hostlists to
+list of header specifiers.
+.new
+If a specifier does not start with a circumflex (^)
+then it is treated as a header name.
+The header name matching is case insensitive.
+If it does, then it is treated as a (front-anchored)
+regular expression applied to the whole header.
+
+&*Note*&: The colon terminating a header name will need to be doubled
+if used in an RE, and there can legitimately be whitepace before it.
+
+Example:
+.code
+remove_header = \N^(?i)Authentication-Results\s*::\s*example.org;\N
+.endd
+.wen
+
+List expansion is not performed, so you cannot use hostlists to

 create a list of headers, however both connection and message variable expansion
 are performed (&%$acl_c_*%& and &%$acl_m_*%&), illustrated in this example:
 .code
 create a list of headers, however both connection and message variable expansion
 are performed (&%$acl_c_*%& and &%$acl_m_*%&), illustrated in this example:
 .code


@@ -32061,14 +32236,14 @@ warn   hosts           = +internal_hosts
 warn   message         = Remove internal headers
        remove_header   = $acl_c_ihdrs
 .endd
 warn   message         = Remove internal headers
        remove_header   = $acl_c_ihdrs
 .endd

-Header names for removal are accumulated during the MAIL, RCPT, and predata ACLs.
+Header specifiers for removal are accumulated during the MAIL, RCPT, and predata ACLs.

 Matching header lines are removed from the message before processing the DATA and MIME ACLs.
 If multiple header lines match, all are removed.
 There is no harm in attempting to remove the same header twice nor in removing
 Matching header lines are removed from the message before processing the DATA and MIME ACLs.
 If multiple header lines match, all are removed.
 There is no harm in attempting to remove the same header twice nor in removing

-a non-existent header. Further header lines to be removed may be accumulated
-during the DATA and MIME ACLs, after which they are removed from the message,
-if present. In the case of non-SMTP messages, headers to be removed are
-accumulated during the non-SMTP ACLs, and are removed from the message after
+a non-existent header. Further header specifiers for removal may be accumulated
+during the DATA and MIME ACLs, after which matching headers are removed
+if present. In the case of non-SMTP messages, remove specifiers are
+accumulated during the non-SMTP ACLs, and are acted on after

 all the ACLs have run. If a message is rejected after DATA or by the non-SMTP
 ACL, there really is no effect because there is no logging of what headers
 would have been removed.
 all the ACLs have run. If a message is rejected after DATA or by the non-SMTP
 ACL, there really is no effect because there is no logging of what headers
 would have been removed.


@@ -33046,12 +33221,12 @@ address you should specify alternate list separators for both the outer
 
 
 .section "Previously seen user and hosts" "SECTseen"
 
 
 .section "Previously seen user and hosts" "SECTseen"

-.cindex "&%een%& ACL condition"
+.cindex "&%seen%& ACL condition"

 .cindex greylisting
 The &%seen%& ACL condition can be used to test whether a
 situation has been previously met.
 It uses a hints database to record a timestamp against a key.
 .cindex greylisting
 The &%seen%& ACL condition can be used to test whether a
 situation has been previously met.
 It uses a hints database to record a timestamp against a key.

-host. The syntax of the condition is:
+The syntax of the condition is:

 .display
 &`seen =`& <&'optional flag'&><&'time interval'&> &`/`& <&'options'&>
 .endd
 .display
 &`seen =`& <&'optional flag'&><&'time interval'&> &`/`& <&'options'&>
 .endd


@@ -33169,16 +33344,23 @@ the &%count=%& option.
 
 .subsection "Ratelimit options for what is being measured" ratoptmea
 .cindex "rate limiting" "per_* options"
 
 .subsection "Ratelimit options for what is being measured" ratoptmea
 .cindex "rate limiting" "per_* options"

-The &%per_conn%& option limits the client's connection rate. It is not
+.vlist
+.vitem per_conn
+.cindex "rate limiting" per_conn
+This option limits the client's connection rate. It is not

 normally used in the &%acl_not_smtp%&, &%acl_not_smtp_mime%&, or
 &%acl_not_smtp_start%& ACLs.
 
 normally used in the &%acl_not_smtp%&, &%acl_not_smtp_mime%&, or
 &%acl_not_smtp_start%& ACLs.
 

-The &%per_mail%& option limits the client's rate of sending messages. This is
+.vitem per_mail
+.cindex "rate limiting" per_conn
+This option limits the client's rate of sending messages. This is

 the default if none of the &%per_*%& options is specified. It can be used in
 &%acl_smtp_mail%&, &%acl_smtp_rcpt%&, &%acl_smtp_predata%&, &%acl_smtp_mime%&,
 &%acl_smtp_data%&, or &%acl_not_smtp%&.
 
 the default if none of the &%per_*%& options is specified. It can be used in
 &%acl_smtp_mail%&, &%acl_smtp_rcpt%&, &%acl_smtp_predata%&, &%acl_smtp_mime%&,
 &%acl_smtp_data%&, or &%acl_not_smtp%&.
 

-The &%per_byte%& option limits the sender's email bandwidth. It can be used in
+.vitem per_byte
+.cindex "rate limiting" per_conn
+This option limits the sender's email bandwidth. It can be used in

 the same ACLs as the &%per_mail%& option, though it is best to use this option
 in the &%acl_smtp_mime%&, &%acl_smtp_data%& or &%acl_not_smtp%& ACLs; if it is
 used in an earlier ACL, Exim relies on the SIZE parameter given by the client
 the same ACLs as the &%per_mail%& option, though it is best to use this option
 in the &%acl_smtp_mime%&, &%acl_smtp_data%& or &%acl_not_smtp%& ACLs; if it is
 used in an earlier ACL, Exim relies on the SIZE parameter given by the client


@@ -33186,7 +33368,9 @@ in its MAIL command, which may be inaccurate or completely missing. You can
 follow the limit &'m'& in the configuration with K, M, or G to specify limits
 in kilobytes, megabytes, or gigabytes, respectively.
 
 follow the limit &'m'& in the configuration with K, M, or G to specify limits
 in kilobytes, megabytes, or gigabytes, respectively.
 

-The &%per_rcpt%& option causes Exim to limit the rate at which recipients are
+.vitem per_rcpt
+.cindex "rate limiting" per_rcpt
+This option causes Exim to limit the rate at which recipients are

 accepted. It can be used in the &%acl_smtp_rcpt%&, &%acl_smtp_predata%&,
 &%acl_smtp_mime%&, or &%acl_smtp_data%& ACLs. In
 &%acl_smtp_rcpt%& the rate is updated one recipient at a time; in the other
 accepted. It can be used in the &%acl_smtp_rcpt%&, &%acl_smtp_predata%&,
 &%acl_smtp_mime%&, or &%acl_smtp_data%& ACLs. In
 &%acl_smtp_rcpt%& the rate is updated one recipient at a time; in the other


@@ -33194,24 +33378,37 @@ ACLs the rate is updated with the total (accepted) recipient count in one go. No
 in either case the rate limiting engine will see a message with many
 recipients as a large high-speed burst.
 
 in either case the rate limiting engine will see a message with many
 recipients as a large high-speed burst.
 

-The &%per_addr%& option is like the &%per_rcpt%& option, except it counts the
+.vitem per_addr
+.cindex "rate limiting" per_addr
+This option is like the &%per_rcpt%& option, except it counts the

 number of different recipients that the client has sent messages to in the
 last time period. That is, if the client repeatedly sends messages to the same
 recipient, its measured rate is not increased. This option can only be used in
 &%acl_smtp_rcpt%&.
 
 number of different recipients that the client has sent messages to in the
 last time period. That is, if the client repeatedly sends messages to the same
 recipient, its measured rate is not increased. This option can only be used in
 &%acl_smtp_rcpt%&.
 

-The &%per_cmd%& option causes Exim to recompute the rate every time the
+.vitem per_cmd
+.cindex "rate limiting" per_cmd
+This option causes Exim to recompute the rate every time the

 condition is processed. This can be used to limit the rate of any SMTP
 command. If it is used in multiple ACLs it can limit the aggregate rate of
 multiple different commands.
 
 condition is processed. This can be used to limit the rate of any SMTP
 command. If it is used in multiple ACLs it can limit the aggregate rate of
 multiple different commands.
 

-The &%count=%& option can be used to alter how much Exim adds to the client's
-measured rate. For example, the &%per_byte%& option is equivalent to
-&`per_mail/count=$message_size`&. If there is no &%count=%& option, Exim
+.vitem count
+.cindex "rate limiting" count
+This option can be used to alter how much Exim adds to the client's
+measured rate.
+A value is required, after an equals sign.
+For example, the &%per_byte%& option is equivalent to
+&`per_mail/count=$message_size`&.
+If there is no &%count=%& option, Exim

 increases the measured rate by one (except for the &%per_rcpt%& option in ACLs
 increases the measured rate by one (except for the &%per_rcpt%& option in ACLs

-other than &%acl_smtp_rcpt%&). The count does not have to be an integer.
+other than &%acl_smtp_rcpt%&).
+The count does not have to be an integer.

 
 

-The &%unique=%& option is described in section &<<ratoptuniq>>& below.
+.vitem unique
+.cindex "rate limiting" unique
+This option is described in section &<<ratoptuniq>>& below.
+.endlist

 
 
 .subsection "Ratelimit update modes" ratoptupd
 
 
 .subsection "Ratelimit update modes" ratoptupd


@@ -33751,7 +33948,7 @@ a specific address, and the other records information that applies to the
 entire domain (for example, that it accepts the local part &'postmaster'&).
 
 When an original callout fails, a detailed SMTP error message is given about
 entire domain (for example, that it accepts the local part &'postmaster'&).
 
 When an original callout fails, a detailed SMTP error message is given about

-the failure. However, for subsequent failures use the cache data, this message
+the failure. However, for subsequent failures that use the cache data, this message

 is not available.
 
 The expiry times for negative and positive address cache records are
 is not available.
 
 The expiry times for negative and positive address cache records are


@@ -35898,6 +36095,7 @@ The system filter is run at the start of a delivery attempt, before any routing
 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
 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

+.cindex retry condition

 of the &%first_delivery%& condition in an &%if%& command in the filter to
 prevent it happening on retries.
 
 of the &%first_delivery%& condition in an &%if%& command in the filter to
 prevent it happening on retries.
 


@@ -38789,6 +38987,7 @@ the following table:
 .display
 &`A   `&        authenticator name (and optional id and sender)
 &`C   `&        SMTP confirmation on delivery
 .display
 &`A   `&        authenticator name (and optional id and sender)
 &`C   `&        SMTP confirmation on delivery

+&`Ci  `&        connection identifier

 &`    `&        command list for &"no mail in SMTP session"&
 &`CV  `&        certificate verification status
 &`D   `&        duration of &"no mail in SMTP session"&
 &`    `&        command list for &"no mail in SMTP session"&
 &`CV  `&        certificate verification status
 &`D   `&        duration of &"no mail in SMTP session"&


@@ -38877,7 +39076,7 @@ logging and the message has a DKIM signature header.
 .section "Reducing or increasing what is logged" "SECTlogselector"
 .cindex "log" "selectors"
 By setting the &%log_selector%& global option, you can disable some of Exim's
 .section "Reducing or increasing what is logged" "SECTlogselector"
 .cindex "log" "selectors"
 By setting the &%log_selector%& global option, you can disable some of Exim's

-default logging, or you can request additional logging. The value of
+default logging to the main log, or you can request additional logging. The value of

 &%log_selector%& is made up of names preceded by plus or minus characters. For
 example:
 .code
 &%log_selector%& is made up of names preceded by plus or minus characters. For
 example:
 .code


@@ -38891,6 +39090,7 @@ selection marked by asterisks:
 .irow &`address_rewrite`&              &nbsp; "address rewriting"
 .irow &`all_parents`&                  &nbsp; "all parents in => lines"
 .irow &`arguments`&                    &nbsp; "command line arguments"
 .irow &`address_rewrite`&              &nbsp; "address rewriting"
 .irow &`all_parents`&                  &nbsp; "all parents in => lines"
 .irow &`arguments`&                    &nbsp; "command line arguments"

+.irow &`connection_id`&                        &nbsp;  "connection identifier"

 .irow &`connection_reject`&            *       "connection rejections"
 .irow &`delay_delivery`&               *       "immediate delivery delayed"
 .irow &`deliver_time`&                 &nbsp; "time taken to attempt delivery"
 .irow &`connection_reject`&            *       "connection rejections"
 .irow &`delay_delivery`&               *       "immediate delivery delayed"
 .irow &`deliver_time`&                 &nbsp; "time taken to attempt delivery"


@@ -38902,7 +39102,7 @@ selection marked by asterisks:
 .irow &`etrn`&                         *       "ETRN commands"
 .irow &`host_lookup_failed`&           *       "as it says"
 .irow &`ident_timeout`&                        &nbsp; "timeout for ident connection"
 .irow &`etrn`&                         *       "ETRN commands"
 .irow &`host_lookup_failed`&           *       "as it says"
 .irow &`ident_timeout`&                        &nbsp; "timeout for ident connection"

-.irow &`incoming_interface`&           &nbsp; "local interface on <= and => lines"
+.irow &`incoming_interface`&           &nbsp; "local interface &amp; port on <= and => lines"

 .irow &`incoming_port`&                        &nbsp; "remote port on <= lines"
 .irow &`lost_incoming_connection`&     *       "as it says (includes timeouts)"
 .irow &`millisec`&                     &nbsp; "millisecond timestamps and RT,QT,DT,D times"
 .irow &`incoming_port`&                        &nbsp; "remote port on <= lines"
 .irow &`lost_incoming_connection`&     *       "as it says (includes timeouts)"
 .irow &`millisec`&                     &nbsp; "millisecond timestamps and RT,QT,DT,D times"


@@ -38986,6 +39186,14 @@ because the arguments are checked before the configuration file is read. The
 only way to log such cases is to interpose a script such as &_util/logargs.sh_&
 between the caller and Exim.
 .next
 only way to log such cases is to interpose a script such as &_util/logargs.sh_&
 between the caller and Exim.
 .next

+.cindex "log" "connection identifier"
+.new
+&%connection_identifier%&: An identifier for the accepted connection is added to
+connection start and end lines and to message accept lines.
+The identifier is tagged by Ci=.
+The value is PID-based, so will reset on reboot and will wrap.
+.wen
+.next

 .cindex "log" "connection rejections"
 &%connection_reject%&: A log entry is written whenever an incoming SMTP
 connection is rejected, for whatever reason.
 .cindex "log" "connection rejections"
 &%connection_reject%&: A log entry is written whenever an incoming SMTP
 connection is rejected, for whatever reason.


@@ -39407,6 +39615,7 @@ the next chapter. The utilities described here are:
 .irow &<<SECTtidydb>>&        &'exim_tidydb'&   "clean up a hints database"
 .irow &<<SECTfixdb>>&         &'exim_fixdb'&    "patch a hints database"
 .irow &<<SECTmailboxmaint>>&  &'exim_lock'&     "lock a mailbox file"
 .irow &<<SECTtidydb>>&        &'exim_tidydb'&   "clean up a hints database"
 .irow &<<SECTfixdb>>&         &'exim_fixdb'&    "patch a hints database"
 .irow &<<SECTmailboxmaint>>&  &'exim_lock'&     "lock a mailbox file"

+.irow &<<SECTexim_msgdate>>&  &'exim_msgdate'&  "Message Ids for humans (exim_msgdate)"

 .endtable
 
 Another utility that might be of use to sites with many MTAs is Tom Kistner's
 .endtable
 
 Another utility that might be of use to sites with many MTAs is Tom Kistner's


@@ -39915,6 +40124,8 @@ Serializing delivery to a specific host (when &%serialize_hosts%& is set in an
 .next
 Limiting the concurrency of specific transports (when &%max_parallel%& is set
 in a transport)
 .next
 Limiting the concurrency of specific transports (when &%max_parallel%& is set
 in a transport)

+.next
+Recording EHLO-time facilities advertised by hosts

 .endlist
 
 
 .endlist
 
 


@@ -40130,9 +40341,16 @@ exim_lock -q /var/spool/mail/spqr \
 .endd
 Note that if a command is supplied, it must be entirely contained within the
 second argument &-- hence the quotes.
 .endd
 Note that if a command is supplied, it must be entirely contained within the
 second argument &-- hence the quotes.

-.ecindex IIDutils

 
 
 
 

+.section "Message Ids for humans (exim_msgdate)" "SECTexim_msgdate"
+.cindex "exim_msgdate"
+The &'exim_msgdate'& utility is written by Andrew Aitchison and included in the Exim distribution.
+This Perl script converts an Exim Mesage ID back into a human readable form.
+For details of &'exim_msgdate'&'s options, run &'exim_msgdate'& with the &%--help%& option.
+
+Section &<<SECTmessiden>>& (Message identification) describes Exim Mesage IDs.
+.ecindex IIDutils

 . ////////////////////////////////////////////////////////////////////////////
 . ////////////////////////////////////////////////////////////////////////////
 
 . ////////////////////////////////////////////////////////////////////////////
 . ////////////////////////////////////////////////////////////////////////////
 


@@ -41809,7 +42027,7 @@ option.
 
 .endlist
 
 
 .endlist
 

-In addition, two ACL conditions are provided:
+In addition, two ACL conditions are provided, usable only in a DKIM ACL:

 
 .vlist
 .vitem &%dkim_signers%&
 
 .vlist
 .vitem &%dkim_signers%&


@@ -42077,18 +42295,30 @@ encoding operation.
 If this value is empty the the expansion result will be empty.
 The third argument should be the recipient domain of the message when
 it arrived at this system.
 If this value is empty the the expansion result will be empty.
 The third argument should be the recipient domain of the message when
 it arrived at this system.

+All arguments are expanded before use.
+
+The result of the expansion is the replacement envelope-from (return path)
+to be used.

 .endlist
 
 .cindex SRS decoding
 To decode an address use this expansion condition:
 .vlist
 .vitem &*inbound_srs&~{*&<&'local&~part'&>&*}{*&<&'secret'&>&*}*&
 .endlist
 
 .cindex SRS decoding
 To decode an address use this expansion condition:
 .vlist
 .vitem &*inbound_srs&~{*&<&'local&~part'&>&*}{*&<&'secret'&>&*}*&

-The first argument should be the recipient local prt as is was received.
+The first argument should be the recipient local part as it was received.

 The second argument is the site secret.
 The second argument is the site secret.

+Both arguments are expanded before use.

 
 If the messages is not for an SRS-encoded recipient the condition will
 
 If the messages is not for an SRS-encoded recipient the condition will

-return false.  If it is, the condition will return true and the variable
+return false.
+If it is, the condition will return true and the variable

 &$srs_recipient$& will be set to the decoded (original) value.
 &$srs_recipient$& will be set to the decoded (original) value.

+
+.new
+If the second argument is empty then the condition returns true if
+the first argument is in valid SRS formet, else false.
+The variable &$srs_recipient$& is not set for this case.
+.wen

 .endlist
 
 Example usage:
 .endlist
 
 Example usage:


@@ -42130,8 +42360,9 @@ Example usage:
   # one, plus the max_rcpt and return_path options
   remote_forwarded_smtp:
     driver =              smtp
   # one, plus the max_rcpt and return_path options
   remote_forwarded_smtp:
     driver =              smtp

-    # modify the envelope from, for mails that we forward
+    # single-recipient so that $original_domain is valid

     max_rcpt =            1
     max_rcpt =            1

+    # modify the envelope from, for mails that we forward

     return_path =         ${srs_encode {SRS_SECRET} {$return_path} {$original_domain}}
 .endd
 
     return_path =         ${srs_encode {SRS_SECRET} {$return_path} {$original_domain}}
 .endd
 


@@ -42238,7 +42469,7 @@ the DATA acl.
 .subsection ACL SSECDMARCACL
 .cindex DMARC "ACL condition"
 
 .subsection ACL SSECDMARCACL
 .cindex DMARC "ACL condition"
 

-DMARC checks cam be run on incoming SMTP  messages by using the
+DMARC checks can be run on incoming SMTP  messages by using the

 &"dmarc_status"& ACL condition in the DATA ACL.  You are required to
 call the &"spf"& condition first in the ACLs, then the &"dmarc_status"&
 condition.  Putting this condition in the ACLs is required in order
 &"dmarc_status"& ACL condition in the DATA ACL.  You are required to
 call the &"spf"& condition first in the ACLs, then the &"dmarc_status"&
 condition.  Putting this condition in the ACLs is required in order


@@ -42710,7 +42941,7 @@ expansion must check this, as it will be called for every possible event type.
 
 The current list of events is:
 .itable all 0 0 4 25* left 10* center 15* center 50* left
 
 The current list of events is:
 .itable all 0 0 4 25* left 10* center 15* center 50* left

-.row auth:fail             after    main       "per driver per authentication attempt"
+.row auth:fail             after    both       "per driver per authentication attempt"

 .row dane:fail              after    transport  "per connection"
 .row msg:complete           after    main       "per message"
 .row msg:defer              after    transport  "per message per delivery try"
 .row dane:fail              after    transport  "per connection"
 .row msg:complete           after    main       "per message"
 .row msg:defer              after    transport  "per message per delivery try"


@@ -42777,6 +43008,7 @@ The expansion of the event_action option should normally
 return an empty string.  Should it return anything else the
 following will be forced:
 .itable all 0 0 2 20* left 80* left
 return an empty string.  Should it return anything else the
 following will be forced:
 .itable all 0 0 2 20* left 80* left

+.row auth:fail       "log information to write"

 .row tcp:connect      "do not connect"
 .row tls:cert         "refuse verification"
 .row smtp:connect     "close connection"
 .row tcp:connect      "do not connect"
 .row tls:cert         "refuse verification"
 .row smtp:connect     "close connection"