X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9cbad13b652da19396511434b18e88533c8f9901..762ca6f356174af684898457987e31a470a3a903:/doc/doc-txt/OptionLists.txt?ds=inline diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 20aeff965..05074bba7 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -48,7 +48,7 @@ release 4.00, and so no router options are shown as earlier than 4.00, though in fact some of them were inherited from earlier versions. ----------------------------------------------------------------------------------------- -accept_8bitmime boolean true main 1.60 changed to true in 4.78 +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_auth string* unset main 4.00 @@ -180,12 +180,14 @@ 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 dsn_from string* + main 4.67 envelope_to_add boolean false transports envelope_to_remove boolean true main @@ -241,12 +243,13 @@ gecos_name string* unset main gecos_pattern string unset main gethostbyname boolean false smtp gnutls_compat_mode boolean unset main 4.70 -gnutls_require_kx string* unset main 4.67 - string* unset smtp 4.67 -gnutls_require_mac string* unset main 4.67 - string* unset smtp 4.67 -gnutls_require_protocols string* unset main 4.67 - string* unset smtp 4.67 +gnutls_enable_pkcs11 boolean false main 4.81 +gnutls_require_kx string* unset main 4.67 deprecated, warns + string* unset smtp 4.67 deprecated, warns +gnutls_require_mac string* unset main 4.67 deprecated, warns + string* unset smtp 4.67 deprecated, warns +gnutls_require_protocols string* unset main 4.67 deprecated, warns + string* unset smtp 4.67 deprecated, warns group string + routers 4.00 unset transports 4.00 replaces local option in some transports header_line_maxsize integer 0 (unset) main 4.14 @@ -373,7 +376,7 @@ once string* unset autoreply once_file_size integer 0 autoreply 3.20 once_repeat time 0s autoreply 2.95 one_time boolean false redirect 4.00 -openssl_options string unset main 4.73 default to unset in 4.78 +openssl_options string +no_sslv2 main 4.73 default changed in 4.80 optional boolean false iplookup 4.00 oracle_servers string unset main 4.00 owners string list unset redirect 4.00 @@ -466,19 +469,19 @@ sender_unqualified_hosts host list unset main senders address list unset routers 4.00 serialize_hosts host list unset smtp 1.60 server_advertise_condition string* unset authenticators 4.14 -server_channelbinding bool false gsasl 4.78 +server_channelbinding bool false gsasl 4.80 server_condition string* unset authenticators 3.10 (plaintext) 4.64 (others) -server_hostname string* "$primary_hostname" cyrus_sasl,gsasl,heimdal_gssapi (cyrus-only) 4.78 (others) -server_keytab string* unset heimdal_gssapi 4.78 +server_hostname string* "$primary_hostname" cyrus_sasl,gsasl,heimdal_gssapi (cyrus-only) 4.80 (others) +server_keytab string* unset heimdal_gssapi 4.80 server_mail_auth_condition string* unset authenticators 3.22 -server_mech string public_name cyrus_sasl,gsasl 4.43 (cyrus-only) 4.78 (others) -server_password string unset gsasl 4.78 +server_mech string public_name cyrus_sasl,gsasl 4.43 (cyrus-only) 4.80 (others) +server_password string unset gsasl 4.80 server_prompts string* unset plaintext 3.10 -server_realm string unset cyrus_sasl,gsasl 4.43 (cyrus-only) 4.78 (others) -server_scram_iter string* unset gsasl 4.78 -server_scram_salt string* unset gsasl 4.78 +server_realm string unset cyrus_sasl,gsasl 4.43 (cyrus-only) 4.80 (others) +server_scram_iter string* unset gsasl 4.80 +server_scram_salt string* unset gsasl 4.80 server_secret string* unset cram_md5 3.10 -server_service string "smtp" cyrus_sasl,gsasl,heimdal_gssapi (cyrus-only) 4.78 (others) +server_service string "smtp" cyrus_sasl,gsasl,heimdal_gssapi (cyrus-only) 4.80 (others) server_set_id string* unset authenticators 3.10 shadow_condition string* unset transports shadow_transport string unset transports @@ -547,6 +550,8 @@ timezone string + main tls_advertise_hosts host list * main 3.20 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_dhparam string* unset main 3.20 tls_on_connect_ports string unset main 4.43 tls_privatekey string* unset main 3.20 @@ -554,7 +559,7 @@ tls_privatekey string* unset main tls_remember_emstp boolean false main 4.21 tls_require_ciphers string* unset smtp 4.00 replaces tls_verify_ciphers string* unset main 4.33 -tls_sni string* unset main 4.78 +tls_sni string* unset main 4.80 tls_tempfail_tryclear boolean true smtp 4.05 tls_try_verify_hosts host list unset main 4.00 tls_verify_certificates string* unset main 3.20 @@ -622,6 +627,7 @@ provide compatibility with Sendmail. -bh Test incoming SMTP call, omitting callouts -bhc Test incoming SMTP call, with callouts -bi * Run bi_command +-bI:help Show list of accepted -bI: options -bm Accept message on standard input -bmalware + Invoke configured malware scanning against supplied filename -bnq Don't qualify addresses in locally submitted messages @@ -641,6 +647,7 @@ provide compatibility with Sendmail. -bV Verify version number -bv Test recipient address verification -bvs Test sender address verification +-bw + Inetd wait mode -C + Use alternate configuration file -D + Define macro for configuration file -d + Turn on debugging output @@ -836,6 +843,7 @@ DEFAULT_CRYPT optional default crypt() function DELIVER_IN_BUFFER_SIZE optional* DELIVER_OUT_BUFFER_SIZE optional* DISABLE_DKIM optional disables DKIM support +DISABLE_DNSSEC optional disables attempts to use DNSSEC DISABLE_D_OPTION optional disables -D option ERRNO_QUOTA optional* error code for system quota failures EXICYCLOG_MAX optional number of old log files to keep @@ -909,7 +917,8 @@ MAX_INTERFACES system maximum network interfaces MSGLOG_DIRECTORY_MODE optional* mode for message log directory MV_COMMAND system path to mv command NO_SYMLINK optional install doesn't make 'exim" symlink -PCRE_CFLAGS system compile flags for PCRE library +PCRE_CONFIG system* use pcre-config for PCRE support +PCRE_LIBS system* library for using PCRE PERL_CC system* compiler for Perl interface code PERL_CCOPTS system* flags for same PERL_COMMAND system path to Perl