Mercurial > dovecot > core-2.2
changeset 22486:fe8060e2ad47
master: Append to existing DOVECOT_PRESERVE_ENVS instead of overwriting it
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Thu, 08 Jun 2017 00:20:38 +0300 |
| parents | ca38a4e36fad |
| children | e60f0e893992 |
| files | src/master/main.c |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/master/main.c Thu Jun 08 00:14:30 2017 +0300 +++ b/src/master/main.c Thu Jun 08 00:20:38 2017 +0300 @@ -431,6 +431,11 @@ return; t_array_init(&keys, 8); + /* preserve existing DOVECOT_PRESERVE_ENVS */ + value = getenv(DOVECOT_PRESERVE_ENVS_ENV); + if (value != NULL) + array_append(&keys, &value, 1); + /* add new environments */ envs = t_strsplit_spaces(set->import_environment, " "); for (; *envs != NULL; envs++) { value = strchr(*envs, '=');