From: Timo Sirainen <tss@iki.fi>
Date: Wed, 14 Jul 2010 12:58:21 +0000 (+0100)
Subject: mbox: Write empty From_-line envelope as MAILER-DAEMON
X-Git-Tag: 2.0.rc3~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=569ace80c4114ed646cec9aa743b162c309fc736;p=thirdparty%2Fdovecot%2Fcore.git

mbox: Write empty From_-line envelope as MAILER-DAEMON
---

diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c
index 9aa98044cd..1e963afb67 100644
--- a/src/lib-storage/index/mbox/mbox-save.c
+++ b/src/lib-storage/index/mbox/mbox-save.c
@@ -126,6 +126,9 @@ static int write_from_line(struct mbox_save_context *ctx, time_t received_date,
 				storage->user->username :
 				t_strconcat(storage->user->username,
 					    "@", my_hostdomain(), NULL);
+		} else if (*from_envelope == '\0') {
+			/* can't write empty envelope */
+			from_envelope = "MAILER-DAEMON";
 		}
 
 		/* save in local timezone, no matter what it was given with */