diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-04-11 16:06:56 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-04-12 23:36:49 +0100 |
| commit | f923454af54f2638fe7f2f7e53a441cdd94d7e56 (patch) | |
| tree | 5fa17d332a2664d0567ac924337c02fb9633c102 | |
| parent | d43cbe256c751f2f2e8c9b55dd8a718967571c21 (diff) | |
forwarding
| -rw-r--r-- | src/src/deliver.c | 5 | ||||
| -rw-r--r-- | src/src/routers/redirect.c | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/src/deliver.c b/src/src/deliver.c index e25de7eb8..85a379c1b 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -5596,7 +5596,7 @@ if (process_recipients != RECIP_IGNORE) new->prop.errors_address = r->errors_to; #ifdef EXPERIMENTAL_INTERNATIONAL new->prop.utf8 = message_smtputf8; - DEBUG(D_deliver) debug_printf("utf8: %c\n", message_smtputf8 ? 'T':'F'); + DEBUG(D_deliver) if (message_smtputf8) debug_printf("utf8\n"); #endif if (r->pno >= 0) @@ -5606,7 +5606,8 @@ if (process_recipients != RECIP_IGNORE) to be passed on to other DSN enabled MTAs */ new->dsn_flags = r->dsn_flags & rf_dsnflags; new->dsn_orcpt = r->orcpt; - DEBUG(D_deliver) debug_printf("DSN: set orcpt: %s flags: %d\n", new->dsn_orcpt, new->dsn_flags); + DEBUG(D_deliver) debug_printf("DSN: set orcpt: %s flags: %d\n", + new->dsn_orcpt, new->dsn_flags); switch (process_recipients) { diff --git a/src/src/routers/redirect.c b/src/src/routers/redirect.c index 0d8c43d20..8f1c2c3d2 100644 --- a/src/src/routers/redirect.c +++ b/src/src/routers/redirect.c @@ -451,6 +451,11 @@ while (generated != NULL) } } +#ifdef EXPERIMENTAL_INTERNATIONAL + next->prop.utf8 = string_is_utf8(next->address) + || (sender_address && string_is_utf8(sender_address)); +#endif + DEBUG(D_route) { debug_printf("%s router generated %s\n %serrors_to=%s transport=%s\n", @@ -470,6 +475,10 @@ while (generated != NULL) else debug_printf("gid=unset "); +#ifdef EXPERIMENTAL_INTERNATIONAL + if (next->prop.utf8) debug_printf("utf8 "); +#endif + debug_printf("home=%s\n", next->home_dir); } } |