X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/25de68847a0b64b019fb05866d92e3f6319f5a43..8b8667503b5248524dbe94fa11be312fca5b380c:/doc/doc-txt/OptionLists.txt diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 366a74b18..8e1b63e82 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -51,6 +51,8 @@ in fact some of them were inherited from earlier versions. accept_8bitmime boolean true main 1.60 changed to true in 4.80 acl_not_smtp string* unset main 4.11 acl_not_smtp_mime string* unset main 4.51 with content scan +acl_smtp_atrn string* unset main 4.99+ +acl_smtp_atrn string* unset main 4.99 acl_smtp_auth string* unset main 4.00 acl_smtp_connect string* unset main 4.11 acl_smtp_data string* unset main 4.00 @@ -296,6 +298,9 @@ hold_domains domain list unset main home_directory string* unset transports 4.00 replaces individual options host_all_ignored string "defer" manualroute 4.67 host_find_failed string "freeze" manualroute 4.00 +host_name_extract string + "${if and {{match{.outlook.com\\$}{$host}} {match{$item}{\\N^250-([\\w.]+)\\s\\N}}} {$1}}" + smtp 4.96 host_lookup host list unset main 3.00 host_lookup_order string list "bydns:byaddr" main 4.30 host_reject_connection host list unset main 4.00 @@ -314,6 +319,8 @@ hosts_pipe_connect host_list unset smtp 4.93 if experimental hosts_randomize boolean false manualroute 4.00 false smtp 3.14 hosts_require_auth host list unset smtp 4.00 +hosts_require_alpn host list unset main 4.95 + smtp 4.95 hosts_require_dane host list unset smtp 4.91 (4.85 experimental) hosts_require_helo host list "*" main 4.95 hosts_require_ocsp host list unset smtp 4.82 if experimental_ocsp @@ -338,6 +345,7 @@ keep_malformed time 4d main keepalive boolean true smtp 2.05 ldap_default_servers string list unset main 3.02 ldap_version int 2 or 3 main 4.14 +limits_advertise_hosts host list * main 4.98 local_from_check boolean true main 3.14 local_from_prefix string unset main 3.14 local_from_suffix string unset main 3.14 @@ -415,6 +423,7 @@ optional boolean false iplookup oracle_servers string unset main 4.00 owners string list unset redirect 4.00 owngroups string list unset redirect 4.00 +panic_coredump boolean false main 4.96 pass_on_timeout boolean false routers 4.00 pass_router string unset routers 4.00 path string "/usr/bin" pipe @@ -468,7 +477,7 @@ receive_timeout time 0s main received_header_text string* + main received_headers_max integer 30 main recipient_unqualified_hosts host list unset main 4.00 replacing receiver_unqualified_hosts -recipients_max integer 50000 main 1.60 default changed in 4.95 (was 0) +recipients_max integer* 50000 main 1.60 default changed in 4.95 (was 0) recipients_max_reject boolean false main 1.70 redirect_router string unset routers 4.00 remote_max_parallel integer 1 main @@ -528,6 +537,11 @@ server_set_id string* unset authenticator set string* unset routers 4.93 shadow_condition string* unset transports shadow_transport string unset transports +sieve_inbox string* "inbox" redirect 4.99 +sieve_enotify_mailto_owner string* "inbox" redirect +sieve_subaddress string* "inbox" redirect +sieve_useraddress string* "inbox" redirect +sieve_vacation_directory string* "inbox" redirect size_addition integer 1024 smtp 1.91 skip_syntax_errors boolean false redirect 4.00 smtp_accept_keepalive boolean true main @@ -598,7 +612,8 @@ 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_alpn string* unset main 4.95 + smtp 4.95 tls_certificate string* unset main 3.20 unset smtp 3.20 tls_dh_max_bits integer 2236 main 4.80