X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/64073d9c1d8cf950c0a9ddf54d71cf50f74cec79..a310a8d09c56e6049714ae4e4070c16ecb6aa2b1:/doc/doc-txt/OptionLists.txt?ds=sidebyside diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 696b5f3fa..fec47946a 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 @@ -82,6 +82,7 @@ allow_localhost boolean false smtp allow_mx_to_ip boolean false main 3.14 allow_symlink boolean false appendfile allow_utf8_domains boolean false main 4.14 +arc_sign string* unset smtp 4.91 with Experimental_ARC auth_advertise_hosts host list "*" main 4.00 authenticated_sender string* unset smtp 4.14 authenticated_sender_force boolean false smtp 4.61 @@ -137,6 +138,7 @@ command string* unset lmtp command_group string unset queryprogram 4.00 command_timeout time 5m smtp command_user string unset queryprogram 4.00 +commandline_checks_require_admin boolean false main 4.90 condition string* unset routers 4.00 connect_timeout time 0s smtp 1.60 connection_max_messages integer 500 smtp 4.00 replaces batch_max @@ -147,12 +149,13 @@ current_directory string unset transports daemon_smtp_ports string unset main 1.75 pluralised in 4.21 daemon_startup_retries int 9 main 4.52 daemon_startup_sleep time 30s main 4.52 +dane_require_tls_ciphers string* unset smtp 4.91 data string unset redirect 4.00 data_timeout time 5m smtp debug_print string* unset authenticators 4.00 unset routers 4.00 unset transports 2.00 -debug_store boolean false main 4.90 +debug_store boolean false main 4.90 delay_after_cutoff boolean true smtp delay_warning time list 24h main delay_warning_condition string* + main 1.73 @@ -166,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 @@ -179,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 @@ -293,14 +298,18 @@ hosts_connection_nolog host list unset main hosts_max_try integer 5 smtp 3.20 hosts_max_try_hardlimit integer 50 smtp 4.50 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 +hosts_require_dane host list unset smtp 4.91 (4.85 experimental) hosts_require_ocsp host list unset smtp 4.82 if experimental_ocsp hosts_require_tls host list unset smtp 3.20 hosts_treat_as_local domain list unset main 1.95 hosts_try_auth host list unset smtp 4.00 +hosts_try_dane host list unset smtp 4.91 (4.85 experimental) hosts_try_fastopen host list unset smtp 4.88 hosts_try_prdr host list unset smtp 4.82 if experimental_prdr ibase_servers string unset main 4.23 @@ -404,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 @@ -528,6 +538,7 @@ socket string* unset lmtp spamd_address string* + main 4.50 with content scan split_spool_directory boolean false main 1.70 spool_directory string ++ main +spool_wireformat boolean false main 4.90 sqlite_lock_timeout time 5s main 4.53 strict_acl_vars boolean false main 4.64 srv_fail_domains domain list unset dnslookup 4.43 @@ -560,6 +571,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 @@ -603,6 +615,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