diff options
| author | Ray Strode <rstrode@redhat.com> | 2014-04-01 13:11:57 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2014-04-10 13:05:01 -0400 |
| commit | e546e4dc6649a4fdf9065322420a28fa7e666782 (patch) | |
| tree | 4cf41e113a9ba51d0ac0cc2b629f837ad2a67ce2 /common | |
| parent | 257132e3bfb339b19ab35f9689748cfc3d3a3f93 (diff) | |
| download | gdm-e546e4dc6649a4fdf9065322420a28fa7e666782.tar.gz | |
worker: get PATH from parent instead of #define
If no PATH is set, then the session worker tries to set one up,
based on guess. This commit changes GDM to just use the PATH given
to GDM itself, rather than guessing (and getting it wrong).
https://bugzilla.gnome.org/show_bug.cgi?id=727980
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile.am | 1 | ||||
| -rw-r--r-- | common/gdm-common.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 2e97090b..ece167b6 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -20,7 +20,6 @@ AM_CPPFLAGS = \ -DGDM_DEFAULTS_CONF=\"$(GDM_DEFAULTS_CONF)\" \ -DGDM_CUSTOM_CONF=\"$(GDM_CUSTOM_CONF)\" \ -DGDM_OLD_CONF=\"$(GDM_OLD_CONF)\" \ - -DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \ $(COMMON_CFLAGS) \ $(NULL) diff --git a/common/gdm-common.c b/common/gdm-common.c index 4017313b..aeb873be 100644 --- a/common/gdm-common.c +++ b/common/gdm-common.c @@ -909,7 +909,7 @@ gdm_get_script_environment (const char *username, /* Runs as root */ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (display_x11_authority_file)); g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (display_name)); - g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (GDM_SESSION_DEFAULT_PATH)); + g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); g_hash_table_remove (hash, "MAIL"); |