diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2015-04-05 20:12:58 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-04-12 19:18:52 +0100 |
| commit | 5a886ce7f82d5add6fdbf17a6ed698f13abb748d (patch) | |
| tree | 75bcf4fff6eda87d9b9e8c5925b37ecc29732e6e | |
| parent | e524074db84d6e2e2701e888ee949d1af4dfb918 (diff) | |
received_protocol
| -rw-r--r-- | TODO | 11 | ||||
| -rw-r--r-- | doc/doc-txt/experimental-spec.txt | 2 | ||||
| -rw-r--r-- | src/src/smtp_in.c | 1 | ||||
| -rw-r--r-- | test/log/4201 | 4 |
4 files changed, 11 insertions, 7 deletions
@@ -23,23 +23,26 @@ to-Alabel convert of helo name ++ helo-time option handling ++ conversion of utf-8 domains for DNS rfc5890 -- MSA mode: convert on forward? +--- mua-wrapper +--- acl control? dsn handling rfc6533 logging -- international msg +++ - international msg - presentation of local-part in log -- a log option? encoding of local_part -Recieved-by header tracking info -- WITH protocol types get UTF8 prefix -- use for logging also +++ Recieved-by header tracking info +++ - WITH protocol types get UTF8 prefix +++ - use for logging also forwarding checks rfc6530 7.1 -3- - rcpt-time rejects get 533 mailbox name not allowed - mail-time rejects get 550 mailbox unavailable - bounces (see dsn handling) +flag in spool file ++ expansions for to- and from-Alabel ? bug1567 diff --git a/doc/doc-txt/experimental-spec.txt b/doc/doc-txt/experimental-spec.txt index 59dd44ea1..79b21fe39 100644 --- a/doc/doc-txt/experimental-spec.txt +++ b/doc/doc-txt/experimental-spec.txt @@ -1291,7 +1291,7 @@ The option allow_utf8_domains is set to true for this message, but all DNS lookups are converted to a-label form. Log lines and Received-by: header lines will aquire a "utf8" -prefix on the 'with' element, eg. utf8esmtp. +prefix on the protocol element, eg. utf8esmtp. Expansion operators: ${utf8_domain_to_alabel:str} diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 2f1a5d623..eb22233ca 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -4005,6 +4005,7 @@ while (done <= 0) { DEBUG(D_receive) debug_printf("smtputf8 requested\n"); message_smtputf8 = allow_utf8_domains = TRUE; + received_protocol = string_sprintf("utf8%s", received_protocol); } break; #endif diff --git a/test/log/4201 b/test/log/4201 index 29ce53d48..299952090 100644 --- a/test/log/4201 +++ b/test/log/4201 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=esmtp S=sss for userx@test.ex -1999-03-02 09:44:33 10HmaY-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=esmtp S=sss for userx@test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 <= ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com H=(client) [127.0.0.1] P=utf8esmtp S=sss for userx@test.ex 1999-03-02 09:44:33 Start queue run: pid=pppp -qq 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: <userx@test.ex> R=localuser 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed |