git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make $acl_verify_message available in following conditions and modifiers
[exim.git]
/
src
/
src
/
acl.c
diff --git
a/src/src/acl.c
b/src/src/acl.c
index 1d20ff7c7555fc42b60d821bde31e239790b936c..c0a5e944f1ab3b5d637d64a8f789b702767383f2 100644
(file)
--- a/
src/src/acl.c
+++ b/
src/src/acl.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/acl.c,v 1.2
7 2005/04/05 13:58:35
ph10 Exp $ */
+/* $Cambridge: exim/src/src/acl.c,v 1.2
8 2005/04/06 14:03:53
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-2099,10
+2099,13
@@
for (; cb != NULL; cb = cb->next)
/* If the verb is WARN, discard any user message from verification, because
such messages are SMTP responses, not header additions. The latter come
/* If the verb is WARN, discard any user message from verification, because
such messages are SMTP responses, not header additions. The latter come
- only from explicit "message" modifiers. */
+ only from explicit "message" modifiers. However, put the user message into
+ $acl_verify_message so it can be used in subsequent conditions or modifiers
+ (until something changes it). */
case ACLC_VERIFY:
rc = acl_verify(where, addr, arg, user_msgptr, log_msgptr, basic_errno);
case ACLC_VERIFY:
rc = acl_verify(where, addr, arg, user_msgptr, log_msgptr, basic_errno);
+ acl_verify_message = *user_msgptr;
if (verb == ACL_WARN) *user_msgptr = NULL;
break;
if (verb == ACL_WARN) *user_msgptr = NULL;
break;