Fix greeter being killing a started session once if a new authentication is started

[sojka/lightdm.git] / src / seat.c

diff --git a/src/seat.c b/src/seat.c
index 01bda3826a5d2a8cfd9a49292de4b0dde20462d7..8d53f875c6f7759c668c396a4360d9cea6bddf7f 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -294,7 +294,7 @@ seat_get_next_session (Seat *seat)
  * Obtains the active session which lightdm expects to be active.
  *
  * This function is different from seat_get_active_session() in that the
- * later (in the case of xlocal seats) dynamically finds the session that is
+ * later (in the case of local seats) dynamically finds the session that is
  * really active (based on the active VT), whereas this function returns the
  * session that lightdm activated last by itself, which may not be the actual
  * active session (i.e. VT changes).
@@ -621,7 +621,7 @@ start_session (Seat *seat, Session *session)
         gboolean backup_logs;
 
         log_dir = config_get_string (config_get_instance (), "LightDM", "log-directory");
-        filename = g_strdup_printf ("%s-greeter.log", display_server_get_name (session_get_display_server (session)));
+        filename = g_strdup_printf ("%s-greeter.log", seat->priv->name);
         log_filename = g_build_filename (log_dir, filename, NULL);
         g_free (log_dir);
         g_free (filename);
@@ -1177,7 +1177,7 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
     /* Get the session to use */
     if (greeter_get_guest_authenticated (greeter))
     {
-        session = create_guest_session (seat, session_name);
+        session = g_object_ref (create_guest_session (seat, session_name));
         if (!session)
             return FALSE;
         session_set_pam_service (session, seat_get_string_property (seat, "pam-autologin-service"));
@@ -1190,7 +1190,7 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
         gchar *sessions_dir = NULL;
         gchar **argv;
 
-        session = greeter_get_authentication_session (greeter);
+        session = greeter_take_authentication_session (greeter);
 
         /* Get session command to run */
         switch (type)
@@ -1234,7 +1234,7 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
 
     /* Switch to this session when it is ready */
     g_clear_object (&seat->priv->session_to_activate);
-    seat->priv->session_to_activate = g_object_ref (session);
+    seat->priv->session_to_activate = session;
 
     /* Return to existing session if it is open */
     username = session_get_username (session);
@@ -1250,34 +1250,36 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
 
     /* If can re-use the display server, stop the greeter first */
     greeter_session = get_greeter_session (seat, greeter);
-    display_server = session_get_display_server (greeter_session);
-    if (!greeter_get_resettable (greeter) &&
-        can_share_display_server (seat, display_server) &&
-        strcmp (display_server_get_session_type (display_server), session_get_session_type (session)) == 0)
+    if (greeter_session)
     {
-        l_debug (seat, "Stopping greeter; display server will be re-used for user session");
+        display_server = session_get_display_server (greeter_session);
+        if (display_server &&
+            !greeter_get_resettable (greeter) &&
+            can_share_display_server (seat, display_server) &&
+            strcmp (display_server_get_session_type (display_server), session_get_session_type (session)) == 0)
+        {
+            l_debug (seat, "Stopping greeter; display server will be re-used for user session");
 
-        /* Run on the same display server after the greeter has stopped */
-        session_set_display_server (session, display_server);
+            /* Run on the same display server after the greeter has stopped */
+            session_set_display_server (session, display_server);
 
-        /* Stop the greeter */
-        session_stop (greeter_session);
+            /* Stop the greeter */
+            session_stop (greeter_session);
 
-        return TRUE;
+            return TRUE;
+        }
     }
+
     /* Otherwise start a new display server for this session */
-    else
+    display_server = create_display_server (seat, session);
+    session_set_display_server (session, display_server);
+    if (!start_display_server (seat, display_server))
     {
-        display_server = create_display_server (seat, session);
-        session_set_display_server (session, display_server);
-        if (!start_display_server (seat, display_server))
-        {
-            l_debug (seat, "Failed to start display server for new session");
-            return FALSE;
-        }
-
-        return TRUE;
+        l_debug (seat, "Failed to start display server for new session");
+        return FALSE;
     }
+
+    return TRUE;
 }
 
 static GreeterSession *
@@ -1866,6 +1868,9 @@ seat_real_display_server_is_used (Seat *seat, DisplayServer *display_server)
         DisplayServer *d;
 
         d = session_get_display_server (session);
+        if (!d)
+            continue;
+
         if (d == display_server || display_server_get_parent (d) == display_server)
             return TRUE;
     }
@@ -1879,10 +1884,36 @@ seat_real_create_greeter_session (Seat *seat)
     return greeter_session_new ();
 }
 
+static Session *
+create_session_cb (Greeter *greeter, Seat *seat)
+{
+    return g_object_ref (create_session (seat, FALSE));
+}
+
+static Greeter *
+create_greeter_cb (Session *session, Seat *seat)
+{
+    Greeter *greeter;
+
+    greeter = greeter_new ();
+    greeter_set_pam_services (greeter,
+                              seat_get_string_property (seat, "pam-service"),
+                              seat_get_string_property (seat, "pam-autologin-service"));
+    g_signal_connect (greeter, GREETER_SIGNAL_CREATE_SESSION, G_CALLBACK (create_session_cb), seat);
+    g_signal_connect (greeter, GREETER_SIGNAL_START_SESSION, G_CALLBACK (greeter_start_session_cb), seat);
+
+    return greeter;
+}
+
 static Session *
 seat_real_create_session (Seat *seat)
 {
-    return session_new ();
+    Session *session;
+
+    session = session_new ();
+    g_signal_connect (session, SESSION_SIGNAL_CREATE_GREETER, G_CALLBACK (create_greeter_cb), seat);
+
+    return session;
 }
 
 static void