From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Tue, 19 Oct 2004 11:29:25 +0000 (+0000)
Subject: Make $recipients available in the predata ACL (fixes an oversight).
X-Git-Tag: exim-4_50~130
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5be20824c59ec2a16692d5ccfaf8c9bfcecbc6a3;p=exim.git

Make $recipients available in the predata ACL (fixes an oversight).
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index a6ad9d25d..c2f94711f 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.10 2004/10/19 11:04:26 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.11 2004/10/19 11:29:25 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -40,6 +40,8 @@ Exim version 4.44
 
  9. Added the /retain_sender option to "control=submission".
 
+10. $recipients is now available in the predata ACL (oversight).
+
 
 Exim version 4.43
 -----------------
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index ff08cbd56..9189c67ee 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/smtp_in.c,v 1.2 2004/10/19 11:04:26 ph10 Exp $ */
+/* $Cambridge: exim/src/src/smtp_in.c,v 1.3 2004/10/19 11:29:25 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -3033,9 +3033,14 @@ while (done <= 0)
       smtp_printf("554 Too many recipients\r\n");
       break;
       }
-
-    rc = (acl_smtp_predata == NULL)? OK :
-      acl_check(ACL_WHERE_PREDATA, NULL, acl_smtp_predata, &user_msg, &log_msg);
+      
+    if (acl_smtp_predata == NULL) rc = OK; else
+      { 
+      enable_dollar_recipients = TRUE;
+      rc = acl_check(ACL_WHERE_PREDATA, NULL, acl_smtp_predata, &user_msg, 
+        &log_msg);
+      enable_dollar_recipients = FALSE;
+      }
 
     if (rc == OK)
       {