X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/2bc0f45ec0637be57e5d87b576a72cac71ccaf81..59620376be73c1ea2c73ccac5a0acff00a62cace:/doc/doc-txt/OptionLists.txt?ds=sidebyside diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 0a6a32073..1618e4279 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 @@ -132,6 +132,7 @@ client_ignore_invalid_base64 boolean false plaintext client_name string* + cram_md5 3.10 client_secret string* unset cram_md5 3.10 client_send string* unset plaintext 3.10 +client_send string* unset external (auth) 4.93 command string* unset lmtp 3.20 unset pipe unset queryprogram 4.00 @@ -170,6 +171,9 @@ dkim_selector string* unset smtp dkim_sign_headers string* (RFC4871) smtp 4.70 dkim_strict string* unset smtp 4.70 dkim_timestamps integer* unset smtp 4.92 +dkim_verify_hashes string sha256:sha512:sha1 main 4.93 +dkim_verify_keytypes string ed25519:rsa main 4.93 +dkim_verify_minimal boolean false main 4.93 dkim_verify_signers string* $dkim_signers main 4.70 directory string* unset appendfile directory_file string* + appendfile @@ -178,9 +182,9 @@ directory_transport string* unset redirect disable_ipv6 boolean false main 4.61 disable_logging boolean false routers 4.11 false transports 4.11 -dmarc_forensic_sender string unset main 4.82 if experimental_dmarc -dmarc_history_file string unset main 4.82 if experimental_dmarc -dmarc_tld_file string unset main 4.82 if experimental_dmarc +dmarc_forensic_sender string unset main 4.82 if experimental_dmarc, 4.93 mainline +dmarc_history_file string unset main 4.82 if experimental_dmarc, 4.93 mainline +dmarc_tld_file string unset main 4.82 if experimental_dmarc, 4.93 mainline 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 @@ -212,6 +216,7 @@ escape_string string ">From " appendfile exim_group string ++ main exim_path string ++ main exim_user string ++ main +exim_version string ++ main 4.93 expn boolean true routers extra_local_interfaces string unset main 4.21 extract_addresses_remove_arguments boolean true main 1.92 @@ -300,6 +305,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 @@ -412,6 +418,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 @@ -496,6 +503,11 @@ 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_param2 string* unset tls (auth) 4.86 (tls-only) 4.93 (external) +server_param3 string* unset tls (auth) 4.86 (tls-only) 4.93 (external) 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 @@ -503,6 +515,7 @@ server_scram_salt string* unset gsasl server_secret string* unset cram_md5 3.10 server_service string "smtp" cyrus_sasl,gsasl,heimdal_gssapi (cyrus-only) 4.80 (others) server_set_id string* unset authenticators 3.10 +set string* unset routers 4.93 shadow_condition string* unset transports shadow_transport string unset transports size_addition integer 1024 smtp 1.91 @@ -569,6 +582,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 @@ -612,6 +626,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