lib-smtp: Fix encoding quoted localparts that end with "."

For example "user..@example.com" or "user..test.@example.com" resulted
in an extra '"' prefix.

diff --git a/src/lib-smtp/smtp-address.c b/src/lib-smtp/smtp-address.c
index bb31d34a67781777f6075ab99b90bc8f39d00396..1bae3301b30f000922be60b55a1eb5a1d2836da7 100644 (file)
--- a/src/lib-smtp/smtp-address.c
+++ b/src/lib-smtp/smtp-address.c
@@ -540,7 +540,7 @@ void smtp_address_write(string_t *out,
                pblock = p;
        }
 
-       if (p == pblock) {
+       if (p == pblock && !quoted) {
                quoted = TRUE;
                str_insert(out, begin, "\"");
        }

diff --git a/src/lib-smtp/test-smtp-address.c b/src/lib-smtp/test-smtp-address.c
index 30e649913978b526627983d05e1e8d6a6ba7b982..ad25f084105da7467270fd0420017dde3ef84e10 100644 (file)
--- a/src/lib-smtp/test-smtp-address.c
+++ b/src/lib-smtp/test-smtp-address.c
@@ -94,6 +94,10 @@ valid_mailbox_parse_tests[] = {
                .input = "Abc..123@example.com",
                .output = "\"Abc..123\"@example.com",
                .address = { .localpart = "Abc..123", .domain = "example.com" },
+       }, {
+               .input = "Abc..@example.com",
+               .output = "\"Abc..\"@example.com",
+               .address = { .localpart = "Abc..", .domain = "example.com" },
        }
 };