Fix gdmflexiserver not being added to the path (broken since 1.1.4)

diff --git a/NEWS b/NEWS
index bcef22eba2d6daeb7edc1b6c172755ea32d5457a..f98c8f34b83655b78e991ca8e80ad95fc15b8bbe 100644 (file)
--- 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 54e4891cda8bcc9d020bbb59144dac6278c63c51..0484aecc0d489018e0837b902a86d90c5dbc74dc 100644 (file)
--- 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);