Go to 20 ACL variables of each type, and make the numbers changeable at

compile time.

3 files changed, 19 insertions, 3 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 83b4de2d7..822795ba7 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.273 2005/12/12 11:41:50 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.274 2005/12/12 15:58:53 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -29,6 +29,12 @@ PH/04 Changed $reply_address to use the raw form of the headers instead of the
 PH/05 If group was specified without a user on a router, and no group or user
       was specified on a transport, the group from the router was ignored.
 
+PH/06 Increased the number of ACL variables to 20 of each type, and arranged
+      for visible compile-time settings that can be used to change these
+      numbers, for those that want even more. Backwards compatibility with old
+      spool files has been maintained. However, going back to a previous Exim
+      release will lost any variables that are in spool files.
+
 
 Exim version 4.60
 -----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 4d0863d7f..2aab4af8d 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.79 2005/12/12 11:02:44 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.80 2005/12/12 15:58:53 ph10 Exp $
 
 New Features in Exim
 --------------------
@@ -20,6 +20,14 @@ PH/01 There is a new global option called disable_ipv6, which does exactly what
       data, etc. are also ignored. If IP literals are enabled, the ipliteral
       router declines to handle IPv6 literal addresses.
 
+PH/01 There are now 20 of each type of ACL variable by default (instead of 10).
+      It is also possible to change the numbers by setting ACL_CVARS and/or
+      ACL_MVARS in Local/Makefile. Backward compatibility is maintained if you
+      upgrade to this release with existing messages containing ACL variable
+      settings on the queue. However, going in the other direction
+      (downgrading) will not be compatible; the values of ACL variables will be
+      lost.
+
 
 Version 4.60
 ------------
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index ce794faca..9bb1173d1 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.13 2005/12/06 10:25:59 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.14 2005/12/12 15:58:53 ph10 Exp $
 
 LISTS OF EXIM OPTIONS
 ---------------------
@@ -735,6 +735,8 @@ 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*