dovecot-1.2: Reverted previous change.
dovecot at dovecot.org
dovecot at dovecot.org
Tue Jul 8 15:21:07 EEST 2008
details: http://hg.dovecot.org/dovecot-1.2/rev/6ccb546b9615
changeset: 7973:6ccb546b9615
user: Timo Sirainen <tss at iki.fi>
date: Tue Jul 08 17:49:24 2008 +0530
description:
Reverted previous change.
diffstat:
1 file changed, 1 insertion(+), 14 deletions(-)
src/deliver/deliver.c | 15 +--------------
diffs (32 lines):
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 @@ 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");
More information about the dovecot-cvs
mailing list