Merge lp:~mterry/lightdm/gdmflexiserver-fix into lp:lightdm

[Michael Terry]

When the pam environment setting code got moved from display.c to session.c, the PATH mangling should have moved with it. This is because pam sets PATH fresh. So we need to insert after pam's done resetting it.

This should make our gdmflexiserver shadowing work again.

[Sebastien Bacher (seb128)]

I've backported that to oneiric but noticed after than the directory is still /usr/lib/lightdm/lightdm should probably be fixed before merged

=== modified file 'src/display.c'
--- src/display.c	2011-08-08 08:35:15 +0000
+++ src/display.c	2011-08-10 15:01:46 +0000
@@ -549,7 +549,6 @@
 create_session (Display *display, PAMSession *authentication, const gchar *session_name, gboolean is_greeter, const gchar *log_filename)
 {
     gchar *sessions_dir, *filename, *path, *command = NULL;
-    const gchar *orig_path;
     GKeyFile *session_desktop_file;
     Session *session;
     gchar *cookie;
@@ -613,18 +612,6 @@
     process_set_env (PROCESS (session), "DESKTOP_SESSION", session_name); // FIXME: Apparently deprecated?
     process_set_env (PROCESS (session), "GDMSESSION", session_name); // FIXME: Not cross-desktop
 
-    /* Insert our own utility directory to PATH
-     * This is to provide gdmflexiserver which provides backwards compatibility with GDM.
-     * This can be removed when this is no longer required.
-     */
-    orig_path = process_get_env (PROCESS (session), "PATH");
-    if (orig_path)
-    {
-        path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
-        process_set_env (PROCESS (session), "PATH", path);
-        g_free (path);
-    }
-
     process_set_log_file (PROCESS (session), log_filename);
 
     /* Open ConsoleKit session */

=== modified file 'src/session.c'
--- src/session.c	2011-07-26 07:06:27 +0000
+++ src/session.c	2011-08-10 15:01:46 +0000
@@ -162,6 +162,7 @@
     gboolean result;
     User *user;
     gchar *absolute_command;
+    const gchar *orig_path;
     GError *error = NULL;
 
     g_return_val_if_fail (session->priv->authentication != NULL, FALSE);
@@ -186,6 +187,19 @@
     process_set_env (PROCESS (session), "SHELL", user_get_shell (user));
     set_env_from_authentication (session, session->priv->authentication);
 
+    /* Insert our own utility directory to PATH
+     * This is to provide gdmflexiserver which provides backwards compatibility with GDM.
+     * Must be done after set_env_from_authentication because that often sets PATH.
+     * This can be removed when this is no longer required.
+     */
+    orig_path = process_get_env (PROCESS (session), "PATH");
+    if (orig_path)
+    {
+        gchar *path = g_strdup_printf ("%s:%s", PKGLIBEXEC_DIR, orig_path);
+        process_set_env (PROCESS (session), "PATH", path);
+        g_free (path);
+    }
+
     if (session->priv->cookie)
         process_set_env (PROCESS (session), "XDG_SESSION_COOKIE", session->priv->cookie);