From: Timo Sirainen <tss@iki.fi>
Date: Mon, 2 Feb 2009 17:50:27 +0000 (-0500)
Subject: deliver: If -a wasn't specified and no Envelope-To: header, the fallback implementati... 
X-Git-Tag: 1.2.beta1~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c5b34afa6d724f088d4bd31b3514d29b792fa50;p=thirdparty%2Fdovecot%2Fcore.git

deliver: If -a wasn't specified and no Envelope-To: header, the fallback implementation was buggy.
Patch by Steffen Kaiser.

--HG--
branch : HEAD
---

diff --git a/src/deliver/deliver.c b/src/deliver/deliver.c
index 0cdfbe9b62..9bde35885b 100644
--- a/src/deliver/deliver.c
+++ b/src/deliver/deliver.c
@@ -1133,7 +1133,7 @@ int main(int argc, char *argv[])
 	if (destaddr == NULL) {
 		destaddr = deliver_get_address(mail, "Envelope-To");
 		if (destaddr == NULL) {
-			destaddr = strchr(user, '@') == NULL ? user :
+			destaddr = strchr(user, '@') != NULL ? user :
 				t_strconcat(user, "@",
 					    deliver_set->hostname, NULL);
 		}