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 /common | |
| 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 'common')
| -rw-r--r-- | common/Makefile.am | 1 | ||||
| -rw-r--r-- | common/gdm-common.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index ece167b6..2e97090b 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -20,6 +20,7 @@ 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 aeb873be..4017313b 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 (g_getenv ("PATH"))); + g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (GDM_SESSION_DEFAULT_PATH)); g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); g_hash_table_remove (hash, "MAIL"); |