# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1215519564 -19800
# Node ID 6ccb546b9615024847ff76bd0ef07973d446fb22
# Parent  97f3adc9ac61f7bf849e1dd69f0d2148650bd021
Reverted previous change.

diff -r 97f3adc9ac61 -r 6ccb546b9615 src/deliver/deliver.c
--- a/src/deliver/deliver.c	Tue Jul 08 16:26:54 2008 +0530
+++ b/src/deliver/deliver.c	Tue Jul 08 17:49:24 2008 +0530
@@ -691,7 +691,6 @@
 	const char *mail_env, *const *envs, *home;
 	unsigned int i, count;
 	string_t *str;
-	char *env, *p;
 
 	home = getenv("HOME");
 
@@ -701,19 +700,7 @@
 	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");