diff options
| author | Paul J Stevens <paul@nfg.nl> | 2010-04-30 13:48:08 +0200 |
|---|---|---|
| committer | Paul J Stevens <paul@nfg.nl> | 2010-04-30 13:48:08 +0200 |
| commit | 6dc60b4274dc2823567217f2904e88608a5486c3 (patch) | |
| tree | 7fd5d336d32745492d9a8426a47086ca6465b75b | |
| parent | 794fb9d54edd9363082919970a62ae3fbb19074f (diff) | |
wip #844
| -rw-r--r-- | src/modules/sortsieve.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/modules/sortsieve.c b/src/modules/sortsieve.c index b254f1a2..84611b0e 100644 --- a/src/modules/sortsieve.c +++ b/src/modules/sortsieve.c @@ -530,11 +530,15 @@ int sort_getheader(sieve2_context_t *s, void *my) int sort_getenvelope(sieve2_context_t *s, void *my) { struct sort_context *m = (struct sort_context *)my; + const char *to, *from; - sieve2_setvalue_string(s, "to", - m->message->envelope_recipient->str); - sieve2_setvalue_string(s, "from", - (char *)dbmail_message_get_header(m->message, "Return-Path")); + to = dbmail_message_get_envelope_recipient(m->message); + from = dbmail_message_get_header(m->message, "Return-Path"); + + TRACE(TRACE_DEBUG, "from [%s], to [%s]", from, to); + + sieve2_setvalue_string(s, "to", (char *)to); + sieve2_setvalue_string(s, "from", (char *)from); return SIEVE2_OK; } @@ -606,20 +610,20 @@ int sort_debugtrace(sieve2_context_t *s, void *my UNUSED) int trace_level; switch (sieve2_getvalue_int(s, "level")) { - case 0: - case 1: - case 2: - trace_level = TRACE_INFO; - break; - case 3: - case 4: - case 5: - default: - trace_level = TRACE_DEBUG; - break; - } - - TRACE(trace_level, "libSieve: module [%s] file [%s] function [%s] message [%s]\n", + case 0: + case 1: + case 2: + trace_level = TRACE_INFO; + break; + case 3: + case 4: + case 5: + default: + trace_level = TRACE_DEBUG; + break; + } + + TRACE(trace_level, "sieve: [%s,%s,%s: [%s]\n", sieve2_getvalue_string(s, "module"), sieve2_getvalue_string(s, "file"), sieve2_getvalue_string(s, "function"), |