X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fenvironment.c;h=c394eb7e7b9f9b31b576857cbe27db5fc105c615;hb=9cffa4367b034b97a01fb3a0cf8095d8f56fa56a;hp=b768a0fd6e158a383e2eb489a67cd16c1b280cd8;hpb=271019bd0730f90f81d44ea0946707588df242d6;p=exim.git diff --git a/src/src/environment.c b/src/src/environment.c index b768a0fd6..c394eb7e7 100644 --- a/src/src/environment.c +++ b/src/src/environment.c @@ -44,11 +44,12 @@ else if (Ustrcmp(keep_environment, "*") != 0) /* It's considered broken if we do not find the '=', according to Florian Weimer. For now we ignore such strings. unsetenv() would complain, getenv() would complain. */ - uschar *eqp = Ustrchr(*p, '='); + uschar * eqp = Ustrchr(*p, '='); if (eqp) { - uschar *name = string_copyn(*p, eqp - *p); + uschar * name = string_copyn(*p, eqp - *p); + if (OK != match_isinlist(name, CUSS &keep_environment, 0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL)) if (os_unsetenv(name) < 0) return FALSE; @@ -60,11 +61,11 @@ else if (Ustrcmp(keep_environment, "*") != 0) } if (add_environment) { - uschar *p; + uschar * p; int sep = 0; - const uschar* envlist = add_environment; - while ((p = string_nextinlist(&envlist, &sep, NULL, 0))) - putenv(CS p); + const uschar * envlist = add_environment; + + while ((p = string_nextinlist(&envlist, &sep, NULL, 0))) putenv(CS p); } return TRUE;