From: Timo Sirainen <tss@iki.fi>
Date: Tue, 8 Jul 2008 12:19:24 +0000 (+0530)
Subject: Reverted previous change.
X-Git-Tag: 1.2.alpha1~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8718bb7b861f4bcf2d5434e169106b40b110bce0;p=thirdparty%2Fdovecot%2Fcore.git

Reverted previous change.

--HG--
branch : HEAD
---

diff --git a/src/deliver/deliver.c b/src/deliver/deliver.c
index a82ae27191..444d09ca63 100644
--- a/src/deliver/deliver.c
+++ b/src/deliver/deliver.c
@@ -691,7 +691,6 @@ static void expand_envs(const char *user)
 	const char *mail_env, *const *envs, *home;
 	unsigned int i, count;
 	string_t *str;
-	char *env, *p;
 
 	home = getenv("HOME");
 
@@ -701,19 +700,7 @@ static void expand_envs(const char *user)
 	for (i = 0; i < count; i++) {
 		str_truncate(str, 0);
 		var_expand(str, envs[i], table);
-
-		env = str_c_modifiable(str);
-		p = strchr(env, '=');
-		if (p != NULL) {
-			*p = '\0';
-			/* more or less temporary solution to allow lda section
-			   to override plugin settings. after config rewrite
-			   this should go away. */
-			if (getenv(env) == NULL) {
-				*p = '=';
-				env_put(env);
-			}
-		}
+		env_put(str_c(str));
 	}
 
 	mail_env = getenv("MAIL_LOCATION");