X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e73e1b8f9d4e962041a9e18fb23fc3c3838b055c..c2046b73572e3b2ea94b4bf7fea9810b73d606c4:/doc/doc-docbook/spec.xfpt?ds=inline diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index 911f17ad8..7b92a2f21 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -12536,9 +12536,10 @@ command that does not succeed. Otherwise it is set to &"0"&. This makes it possible to distinguish between &"did not try to authenticate"& (&$sender_host_authenticated$& is empty and &$authentication_failed$& is set to &"0"&) and &"tried to authenticate but failed"& (&$sender_host_authenticated$& -is empty and &$authentication_failed$& is set to &"1"&). Failure includes any -negative response to an AUTH command, including (for example) an attempt to use -an undefined mechanism. +is empty and &$authentication_failed$& is set to &"1"&). +Failure includes cancellation of a authentication attempt, +and any negative response to an AUTH command, +(including, for example, an attempt to use an undefined mechanism). .vitem &$av_failed$& .cindex "content scanning" "AV scanner failure" @@ -14897,6 +14898,7 @@ listed in more than one group. .row &%gnutls_compat_mode%& "use GnuTLS compatibility mode" .row &%gnutls_allow_auto_pkcs11%& "allow GnuTLS to autoload PKCS11 modules" .row &%hosts_require_alpn%& "mandatory ALPN" +.row &%hosts_require_helo%& "mandatory HELO/EHLO" .row &%openssl_options%& "adjust OpenSSL compatibility options" .row &%tls_advertise_hosts%& "advertise TLS to these hosts" .row &%tls_alpn%& "acceptable protocol names" @@ -16400,6 +16402,12 @@ See also the &%tls_alpn%& option. managed by this option, and should be done separately. +.option hosts_require_helo main "host list&!!" * +.cindex "HELO/EHLO" requiring +Exim will require an accepted HELO or EHLO command from a host matching +this list, before accepting a MAIL command. + + .option hosts_proxy main "host list&!!" unset .cindex proxy "proxy protocol" This option enables use of Proxy Protocol proxies for incoming @@ -17128,9 +17136,9 @@ not count as protocol errors (see &%smtp_max_synprot_errors%&). .option pipelining_connect_advertise_hosts main "host list&!!" * .cindex "pipelining" "early connection" -.cindex "pipelining" PIPE_CONNECT -.cindex "ESMTP extensions" PIPE_CONNECT -If Exim is built with the SUPPORT_PIPE_CONNECT build option +.cindex "pipelining" PIPECONNECT +.cindex "ESMTP extensions" PIPECONNECT +If Exim is built without the DISABLE_PIPE_CONNECT build option this option controls which hosts the facility is advertised to and from which pipeline early-connection (before MAIL) SMTP commands are acceptable. @@ -17138,7 +17146,11 @@ When used, the pipelining saves on roundtrip times. See also the &%hosts_pipe_connect%& smtp transport option. -The SMTP service extension keyword advertised is &"PIPE_CONNECT"&. +The SMTP service extension keyword advertised is &"PIPECONNECT"&; +it permits the client to pipeline +TCP connection and hello command (inclear phase), +or TLS-establishment and hello command (encrypted phase), +on later connections to the same host. .option prdr_enable main boolean false @@ -25641,7 +25653,7 @@ that matches this list, even if the server host advertises PIPELINING support. .option hosts_pipe_connect smtp "host list&!!" unset .cindex "pipelining" "early connection" -.cindex "pipelining" PIPE_CONNECT +.cindex "pipelining" PIPECONNECT If Exim is built with the SUPPORT_PIPE_CONNECT build option this option controls which to hosts the facility watched for and recorded, and used for subsequent connections. @@ -25791,11 +25803,6 @@ There will be no fallback to in-clear communication. See the &%dnssec_request_domains%& router and transport options. See section &<>&. -.option hosts_require_helo smtp "host list&!!" * -.cindex "HELO/EHLO" requiring -Exim will require an accepted HELO or EHLO command from a host matching -this list, before accepting a MAIL command. - .option hosts_require_ocsp smtp "host list&!!" unset .cindex "TLS" "requiring for certain servers" Exim will request, and check for a valid Certificate Status being given, on a @@ -31716,6 +31723,8 @@ with &`-d`&, with the output going to a new logfile in the usual logs directory, by default called &'debuglog'&. .new +Logging set up by the control will be maintained across spool residency. + Options are a slash-separated list. If an option takes an argument, the option name and argument are separated by an equals character. @@ -38453,7 +38462,7 @@ LOG_FILE_PATH, and uses the first item it finds that is neither empty nor &"syslog"&. This means that an empty item in &%log_file_path%& can be used to mean &"use the path specified at build time"&. If no such item exists, log files are written in the &_log_& subdirectory of the spool directory. This is -equivalent to the setting: +equivalent to the configuration file setting: .code log_file_path = $spool_directory/log/%slog .endd @@ -38464,7 +38473,7 @@ that is where the logs are written. A log file path may also contain &`%D`& or &`%M`& if datestamped log filenames are in use &-- see section &<>& below. -Here are some examples of possible settings: +Here are some examples of possible Makefile settings: .display &`LOG_FILE_PATH=syslog `& syslog only &`LOG_FILE_PATH=:syslog `& syslog and default path @@ -39220,7 +39229,7 @@ On accept lines, where PIPELINING was offered but not used by the client, the field has a minus appended. .cindex "pipelining" "early connection" -If Exim is built with the SUPPORT_PIPE_CONNECT build option +If Exim is built without the DISABLE_PIPE_CONNECT build option accept "L" fields have a period appended if the feature was offered but not used, or an asterisk appended if used. Delivery "L" fields have an asterisk appended if used. @@ -42162,6 +42171,9 @@ There is no need to periodically change this key; a timestamp is also encoded. The second argument should be given as the envelope sender address before this encoding operation. +.new +If this value is empty the the expansion result will be empty. +.wen The third argument should be the recipient domain of the message when it arrived at this system. .endlist