X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/f78eb7c6264c5f1a4ec2fb24c39060e0686f7714..d78371933afdcbdb420e40a2855b548a4673dc3d:/doc/doc-txt/OptionLists.txt?ds=inline diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 3268b3cbe..1b73b1e5e 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.16 2006/02/10 14:25:43 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.27 2006/11/06 15:50:12 ph10 Exp $ LISTS OF EXIM OPTIONS --------------------- @@ -11,7 +11,7 @@ This file contains complete lists of four kinds of Exim option: 4. Those that can appear in the build time configuration for the Exim monitor (Local/eximon.conf). -This file was last updated for Exim release 4.60. +This file was last updated for Exim release 4.64. 1. RUN TIME OPTIONS @@ -68,6 +68,7 @@ acl_smtp_rcpt string* unset main acl_smtp_starttls string* unset main 4.11 acl_smtp_vrfy string* unset main 4.00 address_data string* unset routers 4.00 +address_retry_include_sender boolean true smtp 4.64 address_test boolean true routers 4.14 admin_groups string list unset main 3.02 allow_domain_literals boolean false main 4.00 replacing forbid_domain_literals @@ -83,6 +84,7 @@ allow_symlink boolean false appendfile allow_utf8_domains boolean false main 4.14 auth_advertise_hosts host list "*" main 4.00 authenticated_sender string* unset smtp 4.14 +authenticated_sender_force boolean false smtp 4.61 authenticate_hosts host list unset smtp 3.13 auto_thaw time 0s main av_scanner string* + main 4.50 with content scan @@ -124,6 +126,7 @@ 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_ignore_invalid_base64 boolean false plaintext 4.61 client_name string* + cram_md5 3.10 client_secret string* unset cram_md5 3.10 client_send string* unset plaintext 3.10 @@ -156,6 +159,7 @@ deliver_queue_load_max fixed-point unset main delivery_date_add boolean false transports delivery_date_remove boolean true main directory string* unset appendfile +directory_file string* + appendfile directory_mode octal-integer 0700 appendfile directory_transport string* unset redirect 4.00 disable_ipv6 boolean false main 4.61 @@ -202,6 +206,7 @@ file_format string unset appendfile file_must_exist boolean false appendfile file_optional boolean false autoreply file_transport string* unset redirect 4.00 +filter_prepend_home boolean true redirect 4.63 final_timeout time 10m smtp finduser_retries integer 0 main forbid_blackhole boolean false redirect 4.00 @@ -219,6 +224,7 @@ forbid_filter_run boolean false redirect forbid_include boolean false redirect 4.00 forbid_pipe boolean false redirect 4.00 forbid_sieve_filter boolean false redirect 4.44 +forbid_smtp_code boolean false redirect 4.63 freeze_exec_fail boolean false pipe 1.89 freeze_tell boolean false main 4.00 replaces freeze_tell_mailmaster from string* unset autoreply @@ -312,6 +318,7 @@ maildir_format boolean false appendfile maildir_retries integer 10 appendfile 1.70 maildir_tag string* unset appendfile 1.92 maildir_use_size_file boolean false appendfile 4.30 +maildirfolder_create_regex string unset appendfile 4.62 mailstore_format boolean false appendfile 2.00 mailstore_prefix string* unset appendfile 2.00 mailstore_suffix string* unset appendfile 2.00 @@ -425,7 +432,7 @@ return_size_limit integer 100K main rewrite boolean true redirect 4.00 rewrite_headers boolean true dnslookup 4.00 rfc1413_hosts host list * main -rfc1413_query_timeout time 30s main +rfc1413_query_timeout time 5s main router_home_directory string* unset routers 4.11 route_data string* unset manualroute 4.00 route_list string list unset manualroute 4.00 @@ -436,7 +443,7 @@ 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_condition string* unset plaintext 3.10 +server_condition string* unset authenticators 3.10 (plaintext) 4.64 (others) server_hostname string* "$primary_hostname" cyrus_sasl 4.43 server_mail_auth_condition string* unset authenticators 3.22 server_mech string public_name cyrus_sasl 4.43 @@ -479,6 +486,7 @@ spamd_address string + main split_spool_directory boolean false main 1.70 spool_directory string ++ main 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 strip_excess_angle_brackets boolean false main strip_trailing_dot boolean false main @@ -573,6 +581,7 @@ provide compatibility with Sendmail. -bd + Start daemon -bdf + Start daemon and run it in the foreground -be Test string expansion +-bem Test string expansion, read test message first -bF Test system filter file -bf Test user filter file -bfd Set domain for filter testing @@ -627,6 +636,7 @@ provide compatibility with Sendmail. -Mmad + Mark all recipients delivered -Mmd + Mark one recipient delivered -Mrm + Remove message(s) (no bounce) +-Mset + Load message's variables when testing with -be -Mt + Thaw message(s) -Mvb + View message body -Mvh + View message header @@ -735,8 +745,6 @@ to stop you overriding it in your Local/Makefile. Option Type Description ------------------------------------------------------------------------------ -ACL_CVARS=20 optional* number of acl_c variables -ACL_MVARS=20 optional* number of acl_m variables ALT_CONFIG_PREFIX optional restricts location of -C files ALT_CONFIG_ROOT_ONLY optional* privileged -C needs root (not exim) APPENDFILE_MODE optional*