diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2004-10-19 11:29:25 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2004-10-19 11:29:25 +0000 |
| commit | 5be20824c59ec2a16692d5ccfaf8c9bfcecbc6a3 (patch) | |
| tree | 925744d770c8acff8646308a36fb30cf2ecc571b /src | |
| parent | 69358f0206debf14a18c7e798e23133d304232b6 (diff) | |
Make $recipients available in the predata ACL (fixes an oversight).
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/smtp_in.c | 13 |
1 files changed, 9 insertions, 4 deletions
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) { |