Merge lp:~robert-ancell/lightdm/dont-unlock-session-without-authentication into lp:lightdm

[Robert Ancell]

Only unlock sessions when switching to them if the user authenticated via the greeter. This fixes a regression introduced in 1.7.5.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1759
http://jenkins.qa.ubuntu.com/job/lightdm-ci/181/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/98

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/181/rebuild

review: Approve (continuous-integration)

=== modified file 'src/seat.c'
--- src/seat.c	2013-08-21 23:06:57 +0000
+++ src/seat.c	2013-08-24 04:02:30 +0000
@@ -186,10 +186,6 @@
 
     g_return_if_fail (seat != NULL);
 
-    /* Unlock this session */
-    if (session != seat->priv->active_session && !IS_GREETER (session))
-        session_unlock (session);
-
     SEAT_GET_CLASS (seat)->set_active_session (seat, session);
 
     /* Stop any greeters */
@@ -921,6 +917,7 @@
     {
         l_debug (seat, "Returning to existing user session %s", username);
         session_stop (session);
+        session_unlock (existing_session);
         seat_set_active_session (seat, existing_session);
         return TRUE;
     }
 
=== modified file 'tests/scripts/switch-to-greeter-new-session-logout-old.conf'
--- tests/scripts/switch-to-greeter-new-session-logout-old.conf	2013-08-08 10:10:19 +0000
+++ tests/scripts/switch-to-greeter-new-session-logout-old.conf	2013-08-24 04:02:30 +0000
@@ -63,9 +63,6 @@
 #?*SWITCH-TO-USER USERNAME=have-password1
 #?RUNNER SWITCH-TO-USER USERNAME=have-password1
 
-# Existing session is unlocked
-#?LOGIN1 UNLOCK-SESSION
-
 # Switch to greeter
 #?VT ACTIVATE VT=7