Merge lp:~robert-ancell/lightdm/test-mode-broken into lp:lightdm

[Robert Ancell]

Fix test-mode not working, don't try and run the greeter as the greeter user

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/seat.c'
--- src/seat.c	2013-09-09 03:24:00 +0000
+++ src/seat.c	2013-09-19 15:29:33 +0000
@@ -1050,7 +1050,6 @@
     gchar *sessions_dir, **argv;
     SessionConfig *session_config;
     Greeter *greeter_session;
-    gchar *greeter_user;
     const gchar *greeter_wrapper;
 
     l_debug (seat, "Creating greeter session");
@@ -1081,9 +1080,18 @@
     set_session_env (SESSION (greeter_session));
 
     session_set_pam_service (SESSION (greeter_session), GREETER_SERVICE);
-    greeter_user = config_get_string (config_get_instance (), "LightDM", "greeter-user");
-    session_set_username (SESSION (greeter_session), greeter_user);
-    g_free (greeter_user);
+    if (getuid () == 0)
+    {
+        gchar *greeter_user;      
+        greeter_user = config_get_string (config_get_instance (), "LightDM", "greeter-user");
+        session_set_username (SESSION (greeter_session), greeter_user);
+        g_free (greeter_user);
+    }
+    else
+    {
+        /* In test mode run the greeter as ourself */
+        session_set_username (SESSION (greeter_session), user_get_name (accounts_get_current_user ()));
+    }
     session_set_argv (SESSION (greeter_session), argv);
     g_strfreev (argv);
 
 
=== modified file 'src/session.c'
--- src/session.c	2013-08-24 05:28:19 +0000
+++ src/session.c	2013-09-19 15:29:33 +0000
@@ -758,6 +758,8 @@
     else
         x_authority_filename = g_build_filename (user_get_home_directory (session_get_user (session)), ".Xauthority", NULL);
 
+    if (session->priv->log_filename)
+        l_debug (session, "Logging to %s", session->priv->log_filename);
     write_string (session, session->priv->log_filename);
     write_string (session, session->priv->tty);
     write_string (session, x_authority_filename);