Mercurial > dovecot > original-hg > dovecot-1.2

changeset 9590:f8c14abf52b4 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mbox: When generating envelope to From_-line, don't append a second @owndomain if username already has one.
author Timo Sirainen <tss@iki.fi>
date Wed, 14 Jul 2010 13:53:34 +0100
parents 5c0265dba3d1
children aae3b2a12cd0
files src/lib-storage/index/mbox/mbox-save.c
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/mbox/mbox-save.c	Thu Jul 08 13:48:10 2010 +0100
+++ b/src/lib-storage/index/mbox/mbox-save.c	Wed Jul 14 13:53:34 2010 +0100
@@ -120,8 +120,11 @@
 			struct mail_storage *storage =
 				&ctx->mbox->storage->storage;
 
-			from_envelope = t_strconcat(storage->ns->user->username,
-						    "@", my_hostdomain(), NULL);
+			from_envelope =
+				strchr(storage->ns->user->username, '@') != NULL ?
+				storage->ns->user->username :
+				t_strconcat(storage->ns->user->username,
+					    "@", my_hostdomain(), NULL);
 		}
 
 		/* save in local timezone, no matter what it was given with */