Fix problem with smtp_max_per_host; test for completed processes before

[users/jgh/exim.git] / doc / doc-txt / OptionLists.txt

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 2437abfa8e560775317d1b4057afa4f837a82f47..ebdae0f51d908cb5f126242e5fa47556fbbf6ed5 100644 (file)
--- 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.1 2004/10/07 15:04:35 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.5 2005/01/04 16:36:27 ph10 Exp $

 
 LISTS OF EXIM OPTIONS
 ---------------------
 
 LISTS OF EXIM OPTIONS
 ---------------------


@@ -196,6 +196,7 @@ file_transport                       string*         unset         redirect
 final_timeout                        time            10m           smtp
 finduser_retries                     integer         0             main
 forbid_blackhole                     boolean         false         redirect          4.00
 final_timeout                        time            10m           smtp
 finduser_retries                     integer         0             main
 forbid_blackhole                     boolean         false         redirect          4.00

+forbid_exim_filter                   boolean         false         redirect          4.44

 forbid_fail                          boolean         false         redirect          4.00
 forbid_file                          boolean         false         redirect          4.00
 forbid_filter_existstest             boolean         false         redirect          4.00
 forbid_fail                          boolean         false         redirect          4.00
 forbid_file                          boolean         false         redirect          4.00
 forbid_filter_existstest             boolean         false         redirect          4.00


@@ -208,6 +209,7 @@ forbid_filter_reply                  boolean         false         redirect
 forbid_filter_run                    boolean         false         redirect          4.00
 forbid_include                       boolean         false         redirect          4.00
 forbid_pipe                          boolean         false         redirect          4.00
 forbid_filter_run                    boolean         false         redirect          4.00
 forbid_include                       boolean         false         redirect          4.00
 forbid_pipe                          boolean         false         redirect          4.00

+forbid_sieve_filter                  boolean         false         redirect          4.44

 freeze_exec_fail                     boolean         false         pipe              1.89
 freeze_tell                          boolean         false         main              4.00 replaces freeze_tell_mailmaster
 from                                 string*         unset         autoreply
 freeze_exec_fail                     boolean         false         pipe              1.89
 freeze_tell                          boolean         false         main              4.00 replaces freeze_tell_mailmaster
 from                                 string*         unset         autoreply


@@ -245,6 +247,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_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
 hosts_nopass_tls                     host list       unset         smtp              4.00
 hosts_override                       boolean         false         smtp              2.11
 hosts_randomize                      boolean         false         manualroute       4.00


@@ -587,7 +590,8 @@ provide compatibility with Sendmail.
 -bvs             Test sender address verification
 -C             + Use alternate configuration file
 -D             + Define macro for configuration file
 -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)
 -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)


@@ -740,6 +744,7 @@ COMPRESS_SUFFIX              system       suffix added to compressed files
 CONFIGURE_FILE               mandatory    Exim runtime configuration file
 CONFIGURE_FILE_USE_EUID      optional*
 CONFIGURE_FILE_USE_NODE      optional*
 CONFIGURE_FILE               mandatory    Exim runtime configuration file
 CONFIGURE_FILE_USE_EUID      optional*
 CONFIGURE_FILE_USE_NODE      optional*

+CONFIGURE_GROUP              optional*    alternate group for configuration file

 CONFIGURE_OWNER              optional*    alternate owner for configuration file
 CYRUS_PWCHECK_SOCKET         optional     socket for pwcheck daemon
 DBMLIB                       optional**   location of DBM library
 CONFIGURE_OWNER              optional*    alternate owner for configuration file
 CYRUS_PWCHECK_SOCKET         optional     socket for pwcheck daemon
 DBMLIB                       optional**   location of DBM library