diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-03-19 15:25:20 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@src.gnome.org> | 2008-03-19 15:25:20 +0000 |
| commit | f72173acd48f64ec18de2ee7e1b6074b44ae9240 (patch) | |
| tree | 16373f51ef05af39f7616066447ddb39c3a0a495 /daemon/gdm-session-direct.c | |
| parent | 7e3c76d60816fcea1a0580a5d309430bb8992090 (diff) | |
| download | gdm-f72173acd48f64ec18de2ee7e1b6074b44ae9240.tar.gz | |
Make PATH setup consistent between two file
2008-03-19 Ray Strode <rstrode@redhat.com>
* daemon/gdm-session-worker.c
(gdm_session_worker_accredit_user):
* daemon/gdm-session-direct.c
(setup_session_environment):
Make PATH setup consistent between two file
svn path=/trunk/; revision=6043
Diffstat (limited to 'daemon/gdm-session-direct.c')
| -rw-r--r-- | daemon/gdm-session-direct.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c index 2b24436c..9042d7d0 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -59,6 +59,10 @@ #define GDM_SESSION_DBUS_INTERFACE "org.gnome.DisplayManager.Session" #define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel" +#ifndef GDM_SESSION_DEFAULT_PATH +#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin" +#endif + struct _GdmSessionDirectPrivate { /* per open scope */ @@ -1927,9 +1931,14 @@ setup_session_environment (GdmSessionDirect *session) session->priv->user_x11_authority_file); } + /* FIXME: We do this here and in the session worker. We should consolidate + * somehow. + */ gdm_session_direct_set_environment_variable (session, "PATH", - "/bin:/usr/bin:" BINDIR); + strcmp (BINDIR, "/usr/bin") == 0? + GDM_SESSION_DEFAULT_PATH : + BINDIR ":" GDM_SESSION_DEFAULT_PATH); } |