X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/23c7ff99864ed699b3c6e547c1396a02eb6e4b73..214e2000de8e57b8fcfa7489f53c7aaf5dc77cdd:/doc/doc-txt/OptionLists.txt diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt index 42d1d267f..152f02fc6 100644 --- a/doc/doc-txt/OptionLists.txt +++ b/doc/doc-txt/OptionLists.txt @@ -1,9 +1,9 @@ -$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.3 2004/11/04 10:42:11 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.12 2005/11/15 16:10:51 ph10 Exp $ LISTS OF EXIM OPTIONS --------------------- -This file contains complete lists of three kinds of Exim option: +This file contains complete lists of four kinds of Exim option: 1. Those that can appear in the run time configuration file; 2. Those that can be used on the command line; @@ -11,7 +11,7 @@ This file contains complete lists of three 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.40. +This file was last updated for Exim release 4.60. 1. RUN TIME OPTIONS @@ -52,6 +52,7 @@ in fact some of them were inherited from earlier versions. ----------------------------------------------------------------------------------------- accept_8bitmime boolean false main 1.60 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 acl_smtp_connect string* unset main 4.11 acl_smtp_data string* unset main 4.00 @@ -60,6 +61,7 @@ acl_smtp_expn string* unset main acl_smtp_helo string* unset main 4.20 acl_smtp_mail string* unset main 4.11 acl_smtp_mailauth string* unset main 4.21 +acl_smtp_mime string* unset main 4.50 with content scan acl_smtp_predata string* unset main 4.43 acl_smtp_quit string* unset main 4.43 acl_smtp_rcpt string* unset main 4.00 @@ -83,6 +85,7 @@ auth_advertise_hosts host list "*" main authenticated_sender string* unset smtp 4.14 authenticate_hosts host list unset smtp 3.13 auto_thaw time 0s main +av_scanner string* + main 4.50 with content scan batch_id string unset appendfile 4.00 unset lmtp 4.00 unset pipe 4.00 @@ -114,6 +117,7 @@ check_log_inodes integer 0 main check_log_space integer 0 main check_owner boolean true appendfile 3.14 + redirect 4.00 +check_rfc2047_length boolean true main 4.60 check_secondary_mx boolean false dnslookup 4.00 check_spool_inodes integer 0 main check_spool_space integer 0 main @@ -137,6 +141,8 @@ create_file string "anywhere" appendfile current_directory string unset transports 4.00 unset queryprogram 4.00 daemon_smtp_ports string unset main 1.75 pluralised in 4.21 +daemon_startup_retries int 9 main 4.52 +daemon_startup_sleep time 30s main 4.52 data string unset redirect 4.00 data_timeout time 5m smtp debug_print string* unset authenticators 4.00 @@ -156,6 +162,8 @@ disable_logging boolean false routers disable_logging boolean false transports 4.11 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_ipv4_lookup boolean false main 3.20 dns_qualify_single boolean true smtp dns_retrans time 0s main 1.60 @@ -247,6 +255,7 @@ hosts_avoid_esmtp host list unset smtp hosts_avoid_tls host list unset smtp 3.20 hosts_connection_nolog host list unset main 4.43 hosts_max_try integer 5 smtp 3.20 +hosts_max_try_hardlimit integer 50 smtp 4.50 hosts_nopass_tls host list unset smtp 4.00 hosts_override boolean false smtp 2.11 hosts_randomize boolean false manualroute 4.00 @@ -465,8 +474,10 @@ smtp_receive_timeout time 5m main 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 split_spool_directory boolean false main 1.70 spool_directory string ++ main +sqlite_lock_timeout time 5s main 4.53 srv_fail_domains domain list unset dnslookup 4.43 strip_excess_angle_brackets boolean false main strip_trailing_dot boolean false main @@ -492,6 +503,7 @@ timeout time 5m lmtp 1h pipe 1h queryprogram 4.00 5s iplookup 4.00 +timeout_defer boolean false pipe 4.51 timeout_frozen_after time 0s main 3.20 timezone string + main 3.15 tls_advertise_hosts host list * main 3.20 @@ -589,7 +601,8 @@ provide compatibility with Sendmail. -bvs Test sender address verification -C + Use alternate configuration file -D + Define macro for configuration file --d Turn on debugging output +-d + Turn on debugging output +-dd + Ditto, but if a daemon, not for subprocesses -dropcr Remove CR character in input: became a no-op in 4.21 -E Internal use only -ex * Synonym for -oex (for several different x) @@ -728,6 +741,7 @@ APPENDFILE_DIRECTORY_MODE optional* APPENDFILE_LOCKFILE_MODE optional* AR system command to build a library AUTH_CRAM_MD5 driver include cram_md5 authenticator +AUTH_CYRUS_SASL driver include Cyrus SASL authenticator AUTH_PLAINTEXT driver include plaintext authenticator AUTH_SPA driver include SPA (NTLM) authenticator BASENAME_COMMAND system** path to basename