diff options
| author | Ray Strode <rstrode@redhat.com> | 2014-04-22 15:00:44 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2014-04-22 15:00:44 -0400 |
| commit | c9bebed00008724600aef6c401f21245f7678e45 (patch) | |
| tree | 06c324f41fb3776a0eb45f07040136988bb74125 /daemon/gdm-session-worker.c | |
| parent | 76d26d8c1c37c6bd38bcac082d5cc62670fe5d39 (diff) | |
| download | gdm-c9bebed00008724600aef6c401f21245f7678e45.tar.gz | |
Revert "worker: get PATH from parent instead of #define"
This reverts commit e546e4dc6649a4fdf9065322420a28fa7e666782.
It's causing problems because bindir and sbindir are in the wrong
order for a user session.
Diffstat (limited to 'daemon/gdm-session-worker.c')
| -rw-r--r-- | daemon/gdm-session-worker.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index 5fc42c6b..8493fbd0 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -90,6 +90,10 @@ #define GDM_PASSWD_AUXILLARY_BUFFER_SIZE 1024 #endif +#ifndef GDM_SESSION_DEFAULT_PATH +#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin" +#endif + #ifndef GDM_SESSION_ROOT_UID #define GDM_SESSION_ROOT_UID 0 #endif @@ -1503,10 +1507,13 @@ gdm_session_worker_accredit_user (GdmSessionWorker *worker, /* Let's give the user a default PATH if he doesn't already have one */ if (!gdm_session_worker_environment_variable_is_set (worker, "PATH")) { - const char *path; - - path = g_getenv ("PATH"); - gdm_session_worker_set_environment_variable (worker, "PATH", path); + if (strcmp (BINDIR, "/usr/bin") == 0) { + gdm_session_worker_set_environment_variable (worker, "PATH", + GDM_SESSION_DEFAULT_PATH); + } else { + gdm_session_worker_set_environment_variable (worker, "PATH", + BINDIR ":" GDM_SESSION_DEFAULT_PATH); + } } if (! _change_user (worker, uid, gid)) { |