X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/36a3ae5f08725242b1fb4dfecc5617cc9c3e971b..exim-4_83_RC1:/doc/doc-txt/OptionLists.txt?ds=sidebyside diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 1c7881e76..ef6195600 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -54,6 +54,8 @@ 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 expreimental_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 acl_smtp_helo string* unset main 4.20 @@ -171,23 +173,26 @@ 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 dns_again_means_nonexist domain list unset main 1.89 dns_check_names_pattern string + main 2.11 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 dns_ipv4_lookup boolean false main 3.20 dns_qualify_single boolean true smtp dns_retrans time 0s main 1.60 dns_retry integer 0 main 1.60 dns_search_parents boolean false smtp -dns_use_dnssec integer -1 main 4.81 dns_use_edns0 integer -1 main 4.76 domains domain list unset routers 4.00 driver string unset authenticators unset routers 4.00 unset transports drop_cr boolean false main 4.00 became a no-op in 4.21 -dscp string unset smtp 4.81 +dscp string unset smtp 4.82 dsn_from string* + main 4.67 envelope_to_add boolean false transports envelope_to_remove boolean true main @@ -235,6 +240,7 @@ forbid_include boolean false redirect forbid_pipe boolean false redirect 4.00 forbid_sieve_filter boolean false redirect 4.44 forbid_smtp_code boolean false redirect 4.63 +force_command boolean false pipe 4.82 freeze_exec_fail boolean false pipe 1.89 freeze_signal boolean false pipe 4.75 freeze_tell boolean false main 4.00 replaces freeze_tell_mailmaster @@ -242,6 +248,7 @@ from string* unset autoreply gecos_name string* unset main gecos_pattern string unset main gethostbyname boolean false smtp +gnutls_allow_auto_pkcs11 boolean false main 4.82 gnutls_compat_mode boolean unset main 4.70 gnutls_require_kx string* unset main 4.67 deprecated, warns string* unset smtp 4.67 deprecated, warns @@ -288,9 +295,11 @@ hosts_override boolean false smtp hosts_randomize boolean false manualroute 4.00 false smtp 3.14 hosts_require_auth host list unset smtp 4.00 +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_prdr host list unset smtp 4.82 if experimental_prdr ibase_servers string unset main 4.23 ignore_bounce_errors_after time 0s main 4.00 ignore_eacces boolean false redirect 4.00 @@ -395,6 +404,7 @@ pipelining_advertise_hosts host list "*" main port integer 0 iplookup 4.00 string "smtp" smtp preserve_message_logs boolean false main +prdr_enable boolean false main 4.82 if experimental_prdr primary_hostname string + main print_topbitchars boolean false main 1.89 process_log_path string unset main 4.21 @@ -550,8 +560,9 @@ tls_advertise_hosts host list * main tls_certificate string* unset main 3.20 unset smtp 3.20 tls_dh_max_bits integer 2236 main 4.80 -tls_dh_min_bits integer 1024 smtp 4.81 +tls_dh_min_bits integer 1024 smtp 4.82 tls_dhparam string* unset main 3.20 +tls_ocsp_file string* unset main 4.80 if experimental_ocsp tls_on_connect_ports string unset main 4.43 tls_privatekey string* unset main 3.20 unset smtp 3.20 @@ -703,6 +714,7 @@ provide compatibility with Sendmail. -oMai # Supply authenticated id -oMas # Supply authenticated sender -oMi # Supply interface address +-oMm # Supply message reference -oMr # Supply protocol name -oMs # Supply host name -oMt # Supply ident string