X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/c4a8c663b74a35b547d8320547079ca56b3b772e..9438970c97adda0afb9b825b5beff5276a1d613d:/doc/doc-txt/OptionLists.txt?ds=sidebyside diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 5586e7d34..2978aed35 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -127,12 +127,15 @@ check_spool_space integer 0 main check_string string "From " appendfile 3.03 unset pipe 3.03 check_srv string* unset dnslookup 4.31 +client_authz string* unset gsasl 4.94 client_condition string* unset authenticators 4.68 client_ignore_invalid_base64 boolean false plaintext 4.61 client_name string* + cram_md5 3.10 +client_password string* unset gsasl 4.94 client_secret string* unset cram_md5 3.10 client_send string* unset plaintext 3.10 -client_send string* unset external (auth) 4.93 + unset external (auth) 4.93 +client_username string* unset gsasl 4.94 command string* unset lmtp 3.20 unset pipe unset queryprogram 4.00 @@ -171,6 +174,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 @@ -179,9 +185,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 @@ -213,6 +219,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 @@ -500,6 +507,8 @@ server_mail_auth_condition string* unset authenticator 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 @@ -509,6 +518,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