diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2016-12-09 13:16:07 +1300 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2016-12-09 13:16:07 +1300 |
commit | 085a229b9255db3c54e8cc0386805899d1097a9e (patch) | |
tree | 8cfa8d4901716d663d69d9c9db8623804195de16 /src/seat.c | |
parent | d516731ec6f11052b198f84e83af3c382e48d817 (diff) | |
download | lightdm-git-085a229b9255db3c54e8cc0386805899d1097a9e.tar.gz |
Don't try and copy environment variables that don't exist
Diffstat (limited to 'src/seat.c')
-rw-r--r-- | src/seat.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -365,9 +365,12 @@ run_script (Seat *seat, DisplayServer *display_server, const gchar *script_name, process_set_clear_environment (script, TRUE); process_set_env (script, "SHELL", "/bin/sh"); - process_set_env (script, "LD_PRELOAD", g_getenv ("LD_PRELOAD")); - process_set_env (script, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH")); - process_set_env (script, "PATH", g_getenv ("PATH")); + if (g_getenv ("LD_PRELOAD")) + process_set_env (script, "LD_PRELOAD", g_getenv ("LD_PRELOAD")); + if (g_getenv ("LD_LIBRARY_PATH")) + process_set_env (script, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH")); + if (g_getenv ("PATH")) + process_set_env (script, "PATH", g_getenv ("PATH")); /* Variables required for regression tests */ if (g_getenv ("LIGHTDM_TEST_ROOT")) @@ -895,8 +898,10 @@ set_session_env (Session *session) session_set_env (session, "GI_TYPELIB_PATH", g_getenv ("GI_TYPELIB_PATH")); } - session_set_env (session, "LD_PRELOAD", g_getenv ("LD_PRELOAD")); - session_set_env (session, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH")); + if (g_getenv ("LD_PRELOAD")) + session_set_env (session, "LD_PRELOAD", g_getenv ("LD_PRELOAD")); + if (g_getenv ("LD_LIBRARY_PATH")) + session_set_env (session, "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH")); } static Session * |