Add acl_not_smtp_start ACL (mostly Johannes Berg's patch).

2 files changed, 22 insertions, 4 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 1ae87c627..348c279a1 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.362 2006/06/28 13:59:12 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.363 2006/06/28 16:00:23 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -20,8 +20,8 @@ SC/03 Collect data on the number of addresses (recipients) as well
 TF/01 Correct an error in the documentation for the redirect router. Exim
       does (usually) call initgroups() when daemonizing.
 
-TF/02 Call initgroups() when dropping privilege in exim.c, so that Exim runs with
-      consistent privilege compared to when running as a daemon.
+TF/02 Call initgroups() when dropping privilege in exim.c, so that Exim runs
+      with consistent privilege compared to when running as a daemon.
 
 TF/03 Note in the spec that $authenticated_id is not set for local
       submissions from trusted users.
@@ -52,6 +52,10 @@ PH/04 Applied Magnus Holmgren's patch to fix Bugzilla #98: transport's home
 PH/05 Applied Alex Kiernan's patch to fix Bugzilla #99: a problem with
       libradius.
 
+PH/06 Added acl_not_smtp_start, based on Johannes Berg's patch, and set the
+      bit to forbid control=suppress_local_fixups in the acl_not_smtp ACL,
+      because it is too late at that time, and has no effect.
+
 
 Exim version 4.62
 -----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 6fa8b4b83..4f7ca8470 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.103 2006/06/27 14:34:26 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.104 2006/06/28 16:00:23 ph10 Exp $
 
 New Features in Exim
 --------------------
@@ -17,6 +17,20 @@ Version 4.63
    it is automatically prepended to the relative path. This action can now be
    prevented by setting filter_prepend_home false.
 
+2. There is a new acl, set by acl_not_smtp_start, which is run right at the
+   start of receiving a non-SMTP message, before any of the message has been
+   read. (This is the analogue of the acl_smtp_predata ACL for SMTP input.) The
+   result of this ACL is ignored; it cannot be used to reject a message. If
+   you really need to, you could set a value in an ACL variable here and reject
+   based on that in the acl_not_smtp ACL. However, this ACL can be used to set
+   controls, and in particular, it can be used to set control=suppress_local_
+   fixups, which cannot be used in the acl_not_smtp ACL because by the time
+   that ACL is run, it is too late. When the acl_not_smtp_start ACL is run, the
+   sender and recipients are known, so the "senders" and "sender_domains"
+   conditions and $sender_address and $recipients variables can be used.
+   Variables such as $authenticated_ sender are also available. It is possible
+   to specify added header lines in this ACL.
+
 
 Version 4.62
 ------------