Merge lp:~robert-ancell/lightdm/handle-greeter-fail-after-autologin into lp:lightdm

[Robert Ancell]

Fix crash if switching to greeter and it isn't installed

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/seat.c'
--- src/seat.c	2013-10-30 20:19:23 +0000
+++ src/seat.c	2013-10-31 00:39:59 +0000
@@ -392,7 +392,11 @@
         if (!active_session || session_get_display_server (active_session) == display_server)
         {
             l_debug (seat, "Active display server stopped, starting greeter");
-            seat_switch_to_greeter (seat);
+            if (!seat_switch_to_greeter (seat))
+            {
+                l_debug (seat, "Stopping; failed to start a greeter");
+                seat_stop (seat);
+            }
         }
     }
 
@@ -671,7 +675,11 @@
     else if (!IS_GREETER (session) && session == seat_get_active_session (seat))
     {
         l_debug (seat, "Active session stopped, starting greeter");
-        seat_switch_to_greeter (seat);
+        if (!seat_switch_to_greeter (seat))
+        {
+            l_debug (seat, "Stopping; failed to start a greeter");
+            seat_stop (seat);
+        }
     }
 
     /* Stop the display server if no-longer required */
@@ -1241,6 +1249,9 @@
     }
 
     greeter_session = create_greeter_session (seat);
+    if (!greeter_session)
+        return FALSE;
+
     if (seat->priv->session_to_activate)
         g_object_unref (seat->priv->session_to_activate);
     seat->priv->session_to_activate = g_object_ref (greeter_session);

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-10-30 22:28:22 +0000
+++ tests/Makefile.am	2013-10-31 00:39:59 +0000
@@ -22,6 +22,7 @@
 	test-autologin-guest-in-background \
 	test-autologin-timeout-in-background \
 	test-autologin-invalid-user \
+	test-autologin-invalid-greeter \
 	test-autologin-invalid-session \
 	test-crash-authenticate \
 	test-autologin-xserver-crash \
@@ -72,6 +73,7 @@
 	test-language \
 	test-language-no-accounts-service \
 	test-login-crash-authenticate \
+	test-login-invalid-greeter \
 	test-login-gobject \
 	test-login-gobject-manual \
 	test-login-gobject-manual-previous-session \
@@ -307,6 +309,7 @@
 	scripts/autologin-guest-logout.conf \
 	scripts/autologin-guest-timeout.conf \
 	scripts/autologin-in-background.conf \
+	scripts/autologin-invalid-greeter.conf \
 	scripts/autologin-guest-in-background.conf \
 	scripts/autologin-timeout-in-background.conf \
 	scripts/autologin-invalid-session.conf \
@@ -362,6 +365,7 @@
 	scripts/login-guest-logout.conf \
 	scripts/login-guest-no-setup-script.conf \
 	scripts/login-info-prompt.conf \
+	scripts/login-invalid-greeter.conf \
 	scripts/login-invalid-session.conf \
 	scripts/login-invalid-user.conf \
 	scripts/login-logout.conf \

=== added file 'tests/scripts/autologin-invalid-greeter.conf'
--- tests/scripts/autologin-invalid-greeter.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/autologin-invalid-greeter.conf	2013-10-31 00:39:59 +0000
@@ -0,0 +1,30 @@
+#
+# Check quits if autologin session ends and no valid greeter
+#
+
+[SeatDefaults]
+autologin-user=have-password1
+user-session=default
+
+#?RUNNER DAEMON-START
+
+# X server starts
+#?XSERVER-0 START VT=7
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=default USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Logout session
+#?*SESSION-X-0 LOGOUT
+
+# X server stops
+#?XSERVER-0 TERMINATE SIGNAL=15
+
+#?RUNNER DAEMON-EXIT STATUS=1

=== added file 'tests/scripts/login-invalid-greeter.conf'
--- tests/scripts/login-invalid-greeter.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/login-invalid-greeter.conf	2013-10-31 00:39:59 +0000
@@ -0,0 +1,7 @@
+#
+# Check fails to start if invalid greeter
+#
+
+#?RUNNER DAEMON-START
+
+#?RUNNER DAEMON-EXIT STATUS=1

=== added file 'tests/test-autologin-invalid-greeter'
--- tests/test-autologin-invalid-greeter	1970-01-01 00:00:00 +0000
+++ tests/test-autologin-invalid-greeter	2013-10-31 00:39:59 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner autologin-invalid-greeter INVALID

=== added file 'tests/test-login-invalid-greeter'
--- tests/test-login-invalid-greeter	1970-01-01 00:00:00 +0000
+++ tests/test-login-invalid-greeter	2013-10-31 00:39:59 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner login-invalid-greeter INVALID