Kjetil Homme's patch for extended macro features (redefinition,

definition between driver and ACL definitions).

2 files changed, 35 insertions, 2 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 87e001f27..ff8c2835d 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.107 2005/04/04 10:33:49 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.108 2005/04/05 13:58:34 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -119,6 +119,9 @@ PH/20 When checking for unexpected SMTP input at connect time (before writing
 
 PH/21 Added acl_not_smtp_mime to allow for MIME scanning for non-SMTP messages.
 
+PH/22 Added support for macro redefinition, and (re)definition in between
+      driver and ACL definitions.
+
 
 A note about Exim versions 4.44 and 4.50
 ----------------------------------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 6f3ac86d1..b2563f30c 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.32 2005/04/04 10:33:49 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.33 2005/04/05 13:58:34 ph10 Exp $
 
 New Features in Exim
 --------------------
@@ -100,6 +100,36 @@ PH/04 There is a new option called acl_not_smtp_mime that allows you to scan
       MIME parts in non-SMTP messages. It operates in exactly the same way as
       acl_smtp_mime
 
+PH/05 It is now possible to redefine a macro within the configuration file.
+      The macro must have been previously defined within the configuration (or
+      an included file). A definition on the command line using the -D option
+      causes all definitions and redefinitions within the file to be ignored.
+      In other words, -D overrides any values that are set in the file.
+      Redefinition is specified by using '==' instead of '='. For example:
+
+        MAC1 =  initial value
+        ...
+        MAC1 == updated value
+
+      Redefinition does not alter the order in which the macros are applied to
+      the subsequent lines of the configuration file. It is still the same
+      order in which the macros were originally defined. All that changes is
+      the macro's value. Redefinition makes it possible to accumulate values.
+      For example:
+
+        MAC1 =  initial value
+        ...
+        MAC1 == MAC1 and something added
+
+      This can be helpful in situations where the configuration file is built
+      from a number of other files.
+
+PH/06 Macros may now be defined or redefined between router, transport,
+      authenticator, or ACL definitions, as well as in the main part of the
+      configuration. They may not, however, be changed within an individual
+      driver or ACL, or in the local_scan, retry, or rewrite sections of the
+      configuration.
+
 
 Version 4.50
 ------------