summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2012-04-04 17:19:47 +1000
committerRobert Ancell <robert.ancell@canonical.com>2012-04-04 17:19:47 +1000
commit07745120b4c31ec14252c06b300148e2083fac99 (patch)
tree32a621f3c4609349b02fa0528d0528f7b743f767
parentae1f899f2eef4775b90812fae69b0ce02943dade (diff)
downloadlightdm-07745120b4c31ec14252c06b300148e2083fac99.tar.gz
Fix gdmflexiserver not being added to the path (broken since 1.1.4)
-rw-r--r--NEWS1
-rw-r--r--src/session-child.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index bcef22eb..f98c8f34 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Overview of changes in lightdm 1.2.0
* Open log files in append mode
* Add extra checks in liblightdm so that it doesn't send invalid messages
to the daemon
+ * Fix gdmflexiserver not being added to the path (broken since 1.1.4)
Overview of changes in lightdm 1.1.9
diff --git a/src/session-child.c b/src/session-child.c
index 54e4891c..0484aecc 100644
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -172,6 +172,7 @@ session_child_run (int argc, char **argv)
gchar *xauth_filename;
GDBusConnection *bus;
gchar *console_kit_cookie;
+ const gchar *path;
GError *error = NULL;
g_type_init ();
@@ -443,6 +444,11 @@ session_child_run (int argc, char **argv)
g_free (value);
}
+ /* Put our tools directory in the path as a hack so we can use the legacy gdmflexiserver interface */
+ path = pam_getenv (pam_handle, "PATH");
+ if (path)
+ pam_putenv (pam_handle, g_strdup_printf ("PATH=%s:%s", PKGLIBEXEC_DIR, path));
+
/* Catch terminate signal and pass it to the child */
signal (SIGTERM, signal_cb);