diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2012-04-25 00:25:51 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2012-04-25 00:25:51 +0100 |
| commit | 6968512fc21cf0a41b2751bb9df39ed40941c1c3 (patch) | |
| tree | 0664aa6a1eeeab7ff08ad412450219df9b2b7e84 /src | |
| parent | 2416c261306ff5e1248c5501b736b031a27367f5 (diff) | |
Add ACL name to debug output of condition result (bug 1238).
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/acl.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/src/acl.c b/src/src/acl.c index 77fdc5627..32e4c713f 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -3708,7 +3708,7 @@ while (acl != NULL) 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) @@ -3724,29 +3724,29 @@ while (acl != NULL) 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: - 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: - 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: - 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: - 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; } |