git://git.exim.org / users / jgh / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Close writing end of socket for ${readsocket before reading.
[users/jgh/exim.git] / doc / doc-txt / OptionLists.txt
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 5e5815b421440bcc423f315ebf312989e9c317ce..f0ef3c2f88814ba5fc6db525c4c7dc72fbf7a273 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.18 2006/02/23 12:41:22 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.26 2006/10/24 12:56:06 ph10 Exp $
 
 LISTS OF EXIM OPTIONS
 ---------------------
 
 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).
 
   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.61.
+This file was last updated for Exim release 4.64.
 
 
 1. RUN TIME OPTIONS
 
 
 1. RUN TIME OPTIONS
@@ -83,6 +83,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
 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
 authenticate_hosts                   host list       unset         smtp              3.13
 auto_thaw                            time            0s            main
 av_scanner                           string*         +             main              4.50 with content scan
@@ -157,6 +158,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
 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
 directory_mode                       octal-integer   0700          appendfile
 directory_transport                  string*         unset         redirect          4.00
 disable_ipv6                         boolean         false         main              4.61
@@ -203,6 +205,7 @@ file_format                          string          unset         appendfile
 file_must_exist                      boolean         false         appendfile
 file_optional                        boolean         false         autoreply
 file_transport                       string*         unset         redirect          4.00
 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
 final_timeout                        time            10m           smtp
 finduser_retries                     integer         0             main
 forbid_blackhole                     boolean         false         redirect          4.00
@@ -220,6 +223,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_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
 freeze_exec_fail                     boolean         false         pipe              1.89
 freeze_tell                          boolean         false         main              4.00 replaces freeze_tell_mailmaster
 from                                 string*         unset         autoreply
@@ -313,6 +317,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
 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
 mailstore_format                     boolean         false         appendfile        2.00
 mailstore_prefix                     string*         unset         appendfile        2.00
 mailstore_suffix                     string*         unset         appendfile        2.00
@@ -437,7 +442,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
 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
 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
@@ -480,6 +485,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
 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
 srv_fail_domains                     domain list     unset         dnslookup         4.43
 strip_excess_angle_brackets          boolean         false         main
 strip_trailing_dot                   boolean         false         main
@@ -574,6 +580,7 @@ provide compatibility with Sendmail.
 -bd            + Start daemon
 -bdf           + Start daemon and run it in the foreground
 -be              Test string expansion
 -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
 -bF              Test system filter file
 -bf              Test user filter file
 -bfd             Set domain for filter testing
@@ -628,6 +635,7 @@ provide compatibility with Sendmail.
 -Mmad          + Mark all recipients delivered
 -Mmd           + Mark one recipient delivered
 -Mrm           + Remove message(s) (no bounce)
 -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
 -Mt            + Thaw message(s)
 -Mvb           + View message body
 -Mvh           + View message header
@@ -736,8 +744,6 @@ to stop you overriding it in your Local/Makefile.
 Option                       Type         Description
 ------------------------------------------------------------------------------
 
 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*
 ALT_CONFIG_PREFIX            optional     restricts location of -C files
 ALT_CONFIG_ROOT_ONLY         optional*    privileged -C needs root (not exim)
 APPENDFILE_MODE              optional*
Jeremy Harris' staging directory