X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/405074adb94eb8402e9ffd0abe7da4f7c8c827bc..926fce6aaacb525c10c864d4064b1cd086e0dd5a:/doc/doc-txt/OptionLists.txt diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index dfb0219cb..0ef35f54c 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -54,7 +54,7 @@ acl_not_smtp_mime string* unset main acl_smtp_auth string* unset main 4.00 acl_smtp_connect string* unset main 4.11 acl_smtp_data string* unset main 4.00 -acl_smtp_data_prdr string* unset main 4.82 with experimental_prdr +acl_smtp_data_prdr string* unset main 4.82 with experimental_prdr, 4.83 unless disable_prdr acl_smtp_dkim string* unset main 4.70 unless disable_dkim acl_smtp_etrn string* unset main 4.00 acl_smtp_expn string* unset main 4.00 @@ -169,6 +169,7 @@ dkim_private_key string* unset smtp dkim_selector string* unset smtp 4.70 dkim_sign_headers string* (RFC4871) smtp 4.70 dkim_strict string* unset smtp 4.70 +dkim_timestamps integer* unset smtp 4.92 dkim_verify_signers string* $dkim_signers main 4.70 directory string* unset appendfile directory_file string* + appendfile @@ -182,6 +183,7 @@ dmarc_history_file string unset main dmarc_tld_file string unset main 4.82 if experimental_dmarc dns_again_means_nonexist domain list unset main 1.89 dns_check_names_pattern string + main 2.11 +dns_cname_loops integer 0 main 4.92 Set to 9 for older behaviour dns_csa_search_limit integer 5 main 4.60 dns_csa_use_reverse boolean true main 4.60 dns_dnssec_ok integer -1 main 4.82 @@ -298,6 +300,7 @@ hosts_max_try_hardlimit integer 50 smtp hosts_nopass_tls host list unset smtp 4.00 hosts_noproxy_tls host list "*" smtp 4.90 hosts_override boolean false smtp 2.11 +hosts_pipe_connect host_list unset smtp 4.93 if experimental_pipe_connect hosts_randomize boolean false manualroute 4.00 false smtp 3.14 hosts_require_auth host list unset smtp 4.00 @@ -410,6 +413,7 @@ pid_file_path string ++ main pipe_as_creator boolean false pipe pipe_transport string* unset redirect 4.00 pipelining_advertise_hosts host list "*" main 4.14 +pipelining__connect_advertise_hosts host list "*" main 4.92 if experimental_pipe_connect port integer 0 iplookup 4.00 string "smtp" smtp preserve_message_logs boolean false main @@ -494,6 +498,9 @@ server_keytab string* unset heimdal_gssap server_mail_auth_condition string* unset authenticators 3.22 server_mech string public_name cyrus_sasl,gsasl 4.43 (cyrus-only) 4.80 (others) server_password string unset gsasl 4.80 +server_param1 string* unset tls (auth) 4.86 +server_param2 string* unset tls (auth) 4.86 +server_param3 string* unset tls (auth) 4.86 server_prompts string* unset plaintext 3.10 server_realm string unset cyrus_sasl,gsasl 4.43 (cyrus-only) 4.80 (others) server_scram_iter string* unset gsasl 4.80 @@ -567,6 +574,7 @@ timeout_defer boolean false pipe timeout_frozen_after time 0s main 3.20 timezone string + main 3.15 tls_advertise_hosts host list * main 3.20 +tls_advertise_requiretls host list * main 4.92 if experimental_requiretls tls_certificate string* unset main 3.20 unset smtp 3.20 tls_dh_max_bits integer 2236 main 4.80 @@ -610,6 +618,7 @@ use_mbx_lock boolean + appendfile use_shell boolean false pipe 1.70 user string + routers 4.00 unset transports 4.00 replaces individual options +utf8_downconvert integer unset smtp 4.92 if SUPPORT_I18N uucp_from_pattern string + main 1.75 uucp_from_sender string* "$1" main 1.75 verify boolean true routers 4.00