# HG changeset patch
# User Timo Sirainen <timo.sirainen@dovecot.fi>
# Date 1496829501 -10800
# Node ID fb24444dd968f52c261e8840052d238a273a8dc8
# Parent  15ca457e629d818efc877fd7e33e4daa32e76e02
lib-mail: message_address_parse() - Add INVALID_ROUTE/SYNTAX_ERROR only if fill_missing==TRUE

This allows message_address_write() to write the parsed invalid address in a
way that at least somewhat resembles the original input.

diff -r 15ca457e629d -r fb24444dd968 src/lib-mail/message-address.c
--- a/src/lib-mail/message-address.c	Wed Jun 07 12:42:28 2017 +0300
+++ b/src/lib-mail/message-address.c	Wed Jun 07 12:58:21 2017 +0300
@@ -151,7 +151,8 @@
 
 	if (*ctx->parser.data == '@') {
 		if (parse_domain_list(ctx) <= 0 || *ctx->parser.data != ':') {
-			ctx->addr.route = "INVALID_ROUTE";
+			if (ctx->fill_missing)
+				ctx->addr.route = "INVALID_ROUTE";
 			return -1;
 		}
 		ctx->parser.data++;
@@ -191,7 +192,8 @@
 	}
 	if (parse_angle_addr(ctx) < 0) {
 		/* broken */
-		ctx->addr.domain = "SYNTAX_ERROR";
+		if (ctx->fill_missing)
+			ctx->addr.domain = "SYNTAX_ERROR";
 		ctx->addr.invalid_syntax = TRUE;
 	}
 	return ctx->parser.data != ctx->parser.end;
diff -r 15ca457e629d -r fb24444dd968 src/lib-mail/test-message-address.c
--- a/src/lib-mail/test-message-address.c	Wed Jun 07 12:42:28 2017 +0300
+++ b/src/lib-mail/test-message-address.c	Wed Jun 07 12:58:21 2017 +0300
@@ -26,6 +26,8 @@
 		  { NULL, NULL, NULL, "user", "domain", FALSE } },
 		{ "<user@domain>", NULL,
 		  { NULL, NULL, NULL, "user", "domain", FALSE } },
+		{ "<@route>", "<@route:\"\">",
+		  { NULL, NULL, "@route", "", "", TRUE } },
 		{ "<\"\"@domain>", "<\"\"@domain>",
 		  { NULL, NULL, NULL, "", "domain", FALSE } },
 		{ "foo bar <user@domain>", "\"foo bar\" <user@domain>",