Mercurial > dovecot > original-hg > dovecot-1.2
changeset 7973:6ccb546b9615 HEAD
Reverted previous change.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Tue, 08 Jul 2008 17:49:24 +0530 |
parents | 97f3adc9ac61 |
children | afc0d1197fe8 |
files | src/deliver/deliver.c |
diffstat | 1 files changed, 1 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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");