ph10 2004/10/19 12:29:25 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src smtp_in.c
exim-test-orig/AutoTest/confs 585
exim-test-orig/AutoTest/log 585
exim-test-orig/AutoTest/mail 585.ph10
Log:
Make $recipients available in the predata ACL (fixes an oversight).
Revision Changes Path
1.11 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.3 +8 -3 exim/exim-src/src/smtp_in.c
1.2 +1 -1 exim/exim-test-orig/AutoTest/confs/585
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/585
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/585.ph10
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChangeLog 19 Oct 2004 11:04:26 -0000 1.10
+++ ChangeLog 19 Oct 2004 11:29:25 -0000 1.11
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.10 2004/10/19 11:04:26 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -39,6 +39,8 @@
control that does not make sense is encountered.
9. Added the /retain_sender option to "control=submission".
+
+10. $recipients is now available in the predata ACL (oversight).
Exim version 4.43
Index: smtp_in.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smtp_in.c 19 Oct 2004 11:04:26 -0000 1.2
+++ smtp_in.c 19 Oct 2004 11:29:25 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.2 2004/10/19 11:04:26 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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)
{
Index: 585
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/585,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 585 8 Oct 2004 14:49:16 -0000 1.1
+++ 585 19 Oct 2004 11:29:25 -0000 1.2
@@ -22,7 +22,7 @@
begin acl
acl_predata:
- warn message = X-warning: this is a test warning
+ warn message = X-warning: this is a test warning ($recipients)
accept verify = sender
Index: 585
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/585,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 585 8 Oct 2004 14:49:31 -0000 1.1
+++ 585 19 Oct 2004 11:29:25 -0000 1.2
@@ -1,5 +1,5 @@
1999-03-02 09:44:33 U=ph10 sender verify fail for <x@y>: Unrouteable address
1999-03-02 09:44:33 U=ph10 rejected DATA: Sender verify failed
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= postmaster@y U=ph10 P=local-smtp S=288
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= postmaster@y U=ph10 P=local-smtp S=297
1999-03-02 09:44:33 10HmaX-0005vi-00 => ph10 <ph10@y> R=r1 T=local_delivery
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
Index: 585.ph10
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/585.ph10,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 585.ph10 8 Oct 2004 14:49:42 -0000 1.1
+++ 585.ph10 19 Oct 2004 11:29:25 -0000 1.2
@@ -6,6 +6,6 @@
Message-Id: <E10HmaX-0005vi-00@???>
From: postmaster@y
Date: Tue, 2 Mar 1999 09:44:33 +0000
-X-warning: this is a test warning
+X-warning: this is a test warning (ph10@y)
