diff options
| author | Ben Woods <woodsb02@FreeBSD.org> | 2017-04-12 15:44:24 +0000 |
|---|---|---|
| committer | Ben Woods <woodsb02@FreeBSD.org> | 2017-04-12 15:44:24 +0000 |
| commit | 1c5651c00b83d6fdf9f2c1bd0edd0c440e01ef30 (patch) | |
| tree | 20dc47899c18e0b7def1a70348d9c5803a7baf93 /x11/lightdm/files | |
| parent | Provide man page, .desktop file and icon (submitted upstream). (diff) | |
x11/lightdm: Use correct replacement for clearenv()
The previous patch to replace the Linux clearenv(3) function did not
actually clear the environment, but instead created a new environment
variable named environ with the value "NULL".
PR: 218564
Reported by: jbeich
Obtained from: FreeBSD env(1) command
MFH: 2017Q2
Diffstat (limited to 'x11/lightdm/files')
| -rw-r--r-- | x11/lightdm/files/patch-src_process.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/x11/lightdm/files/patch-src_process.c b/x11/lightdm/files/patch-src_process.c index df43c5e4d2e3..b285bd8a30ed 100644 --- a/x11/lightdm/files/patch-src_process.c +++ b/x11/lightdm/files/patch-src_process.c @@ -1,11 +1,20 @@ ---- src/process.c.orig 2016-12-08 21:38:14 UTC +--- src/process.c.orig 2017-04-12 15:33:03 UTC +++ src/process.c -@@ -231,7 +231,7 @@ process_start (Process *process, gboolea +@@ -228,11 +228,16 @@ process_start (Process *process, gboolean block) + + /* Set environment */ + if (process->priv->clear_environment) ++ { #ifdef HAVE_CLEARENV clearenv (); #else - environ = NULL; -+ putenv ("environ=NULL"); ++ extern char **environ; ++ char *cleanenv[1]; ++ environ = cleanenv; ++ cleanenv[0] = NULL; #endif ++ } for (i = 0; i < env_length; i++) setenv (env_keys[i], env_values[i], TRUE); + |