Mercurial > dovecot > core-2.2

changeset 22166:0e46fc927c94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-mail: message_address_write() - Always write <user@domain> as output This is the standard format nowadays, so don't convert <user@domain> into plain user@domain.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Wed, 07 Jun 2017 12:37:09 +0300
parents 9318f53e7817
children 15ca457e629d
files src/lib-mail/message-address.c src/lib-mail/test-message-address.c
diffstat 2 files changed, 4 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-mail/message-address.c	Wed Jun 07 12:35:35 2017 +0300
+++ b/src/lib-mail/message-address.c	Wed Jun 07 12:37:09 2017 +0300
@@ -444,18 +444,8 @@
 			}
 
 			in_group = !in_group;
-		} else if ((addr->name == NULL || *addr->name == '\0') &&
-			   addr->route == NULL) {
-			/* no name and no route. use only mailbox@domain */
-			i_assert(addr->mailbox != NULL);
-
-			str_append_maybe_escape(str, addr->mailbox, FALSE);
-			if (addr->domain[0] != '\0') {
-				str_append_c(str, '@');
-				str_append(str, addr->domain);
-			}
 		} else {
-			/* name and/or route. use full <mailbox@domain> Name */
+			/* "Display Name" <mailbox@domain> */
 			i_assert(addr->mailbox != NULL);
 
 			if (addr->name != NULL) {
--- a/src/lib-mail/test-message-address.c	Wed Jun 07 12:35:35 2017 +0300
+++ b/src/lib-mail/test-message-address.c	Wed Jun 07 12:37:09 2017 +0300
@@ -22,9 +22,9 @@
 		const char *wanted_output;
 		struct message_address addr;
 	} tests[] = {
-		{ "user@domain", NULL,
+		{ "user@domain", "<user@domain>",
 		  { NULL, NULL, NULL, "user", "domain", FALSE } },
-		{ "<user@domain>", "user@domain",
+		{ "<user@domain>", NULL,
 		  { NULL, NULL, NULL, "user", "domain", FALSE } },
 		{ "foo bar <user@domain>", "\"foo bar\" <user@domain>",
 		  { NULL, "foo bar", NULL, "user", "domain", FALSE } },
@@ -44,7 +44,7 @@
 		  { NULL, "hello", NULL, "user", "", TRUE } },
 		{ "hello <user>", "hello <user>",
 		  { NULL, "hello", NULL, "user", "", TRUE } },
-		{ "@domain", NULL,
+		{ "@domain", "<@domain>",
 		  { NULL, NULL, NULL, "", "domain", TRUE } },
 	};
 	static struct message_address group_prefix = {