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
Add ACL name to debug output of condition result (bug 1238).
[exim.git]
/
src
/
src
/
acl.c
diff --git
a/src/src/acl.c
b/src/src/acl.c
index 77fdc56271b3ceda37ff9a0354dbaa1963767868..32e4c713ff211a45aa7cca4381f7249cb4eec220 100644
(file)
--- a/
src/src/acl.c
+++ b/
src/src/acl.c
@@
-3708,7
+3708,7
@@
while (acl != NULL)
switch (cond)
{
case DEFER:
switch (cond)
{
case DEFER:
- HDEBUG(D_acl) debug_printf("%s: condition test deferred
\n", verbs[acl->verb]
);
+ HDEBUG(D_acl) debug_printf("%s: condition test deferred
in %s\n", verbs[acl->verb], acl_name
);
if (basic_errno != ERRNO_CALLOUTDEFER)
{
if (search_error_message != NULL && *search_error_message != 0)
if (basic_errno != ERRNO_CALLOUTDEFER)
{
if (search_error_message != NULL && *search_error_message != 0)
@@
-3724,29
+3724,29
@@
while (acl != NULL)
default: /* Paranoia */
case ERROR:
default: /* Paranoia */
case ERROR:
- HDEBUG(D_acl) debug_printf("%s: condition test error
\n", verbs[acl->verb]
);
+ HDEBUG(D_acl) debug_printf("%s: condition test error
in %s\n", verbs[acl->verb], acl_name
);
return ERROR;
case OK:
return ERROR;
case OK:
- HDEBUG(D_acl) debug_printf("%s: condition test succeeded\n",
- verbs[acl->verb]);
+ HDEBUG(D_acl) debug_printf("%s: condition test succeeded
in %s
\n",
+ verbs[acl->verb]
, acl_name
);
break;
case FAIL:
break;
case FAIL:
- HDEBUG(D_acl) debug_printf("%s: condition test failed
\n", verbs[acl->verb]
);
+ HDEBUG(D_acl) debug_printf("%s: condition test failed
in %s\n", verbs[acl->verb], acl_name
);
break;
/* DISCARD and DROP can happen only from a nested ACL condition, and
DISCARD can happen only for an "accept" or "discard" verb. */
case DISCARD:
break;
/* DISCARD and DROP can happen only from a nested ACL condition, and
DISCARD can happen only for an "accept" or "discard" verb. */
case DISCARD:
- HDEBUG(D_acl) debug_printf("%s: condition test yielded \"discard\"\n",
- verbs[acl->verb]);
+ HDEBUG(D_acl) debug_printf("%s: condition test yielded \"discard\"
in %s
\n",
+ verbs[acl->verb]
, acl_name
);
break;
case FAIL_DROP:
break;
case FAIL_DROP:
- HDEBUG(D_acl) debug_printf("%s: condition test yielded \"drop\"\n",
- verbs[acl->verb]);
+ HDEBUG(D_acl) debug_printf("%s: condition test yielded \"drop\"
in %s
\n",
+ verbs[acl->verb]
, acl_name
);
break;
}
break;
}