X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/ae75164b86600394f3e271a3d54bb88d946eb924..4ce417d09968d9e595f3069bff106a1284f6f6ce:/doc/doc-txt/OptionLists.txt?ds=sidebyside diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 0ef35f54c..8b2dee352 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -98,7 +98,7 @@ batch_max integer 100 appendfile bcc string* unset autoreply bi_command string unset main body_only boolean false transports 2.05 -bounce_message_file string unset main 4.00 +bounce_message_file string* unset main 4.00 expanded from 4.94 bounce_message_text string unset main 4.00 bounce_return_body boolean true main 4.23 bounce_return_message boolean true main 4.00 @@ -127,11 +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 + unset external (auth) 4.93 +client_username string* unset gsasl 4.94 command string* unset lmtp 3.20 unset pipe unset queryprogram 4.00 @@ -170,6 +174,10 @@ 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_min_keysizes string list "rsa=1024 ed25519=250" main 4.94 +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 +186,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 +220,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 @@ -391,6 +400,8 @@ mx_domains domain list unset dnslookup mx_fail_domains domain list unset dnslookup 4.43 mysql_servers string list unset main 3.03 never_users string list unset main +notifier_socket string "$spool_directory/exim_daemon_notify" + main 4.94 notify_comsat boolean false appendfile once string* unset autoreply once_file_size integer 0 autoreply 3.20 @@ -501,6 +512,8 @@ server_password string unset gsasl 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 @@ -508,6 +521,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 @@ -539,9 +553,14 @@ smtp_reserve_hosts host list unset main smtp_return_error_details boolean false main 4.11 socket string* unset lmtp 4.11 spamd_address string* + main 4.50 with content scan +spf_guess string "v=spf1 a/24 mx/24 ptr ?all" + main 4.91 with SUPPORT_SPF +spf_smtp_comment_template string* "Please see http://www.open-spf.org/Why" + main 4.94 with SUPPORT_SPF split_spool_directory boolean false main 1.70 spool_directory string ++ main spool_wireformat boolean false main 4.90 +sqlite_dbfile string* unset main 4.94 with LOOKUP_SQLITE 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 @@ -625,7 +644,7 @@ verify boolean true routers verify_only boolean false routers 4.00 verify_recipient boolean true routers 4.00 verify_sender boolean true routers 4.00 -warn_message_file string unset main 4.00 +warn_message_file string* unset main 4.00 expanded from 4.94 widen_domains string list unset dnslookup 4.00 write_rejectlog boolean true main 4.31