Merge lp:~robert-ancell/lightdm/session-lock-regression into lp:lightdm

[Robert Ancell]

Fix session locking broken in 1.7.5

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1752
http://jenkins.qa.ubuntu.com/job/lightdm-ci/153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/69

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

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/seat.c'
--- src/seat.c	2013-07-30 14:04:44 +0000
+++ src/seat.c	2013-08-08 10:11:25 +0000
@@ -45,6 +45,9 @@
     /* The sessions on this seat */
     GList *sessions;
 
+    /* The last session set to active */
+    Session *active_session;
+
     /* The session to set active when it starts */
     Session *session_to_activate;
   
@@ -179,6 +182,10 @@
 
     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 */
@@ -195,6 +202,15 @@
             session_stop (s);
         }
     }
+
+    /* Lock previous sessions */
+    if (seat->priv->active_session)
+    {
+        if (session != seat->priv->active_session && !IS_GREETER (seat->priv->active_session))
+            session_lock (seat->priv->active_session);
+        g_object_unref (seat->priv->active_session);
+    }
+    seat->priv->active_session = g_object_ref (session);
 }
 
 Session *
@@ -503,6 +519,16 @@
 
     g_signal_handlers_disconnect_matched (session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, seat);
     seat->priv->sessions = g_list_remove (seat->priv->sessions, session);
+    if (session == seat->priv->active_session)
+    {
+        g_object_unref (seat->priv->active_session);
+        seat->priv->active_session = NULL;
+    }
+    if (session == seat->priv->session_to_activate)
+    {
+        g_object_unref (seat->priv->session_to_activate);
+        seat->priv->session_to_activate = NULL;
+    }
 
     display_server = session_get_display_server (session);
     if (!display_server)
@@ -1535,6 +1561,8 @@
         g_signal_handlers_disconnect_matched (session, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
     }
     g_list_free_full (self->priv->sessions, g_object_unref);
+    if (self->priv->active_session)
+        g_object_unref (self->priv->active_session);
     if (self->priv->session_to_activate)
         g_object_unref (self->priv->session_to_activate);
 
 
=== modified file 'src/session.c'
--- src/session.c	2013-07-26 02:27:41 +0000
+++ src/session.c	2013-08-08 10:11:25 +0000
@@ -780,9 +780,9 @@
     g_return_if_fail (session != NULL);
     if (getuid () == 0)
     {
-        if (login1_is_running ())
+        if (session->priv->login1_session)
             login1_lock_session (session->priv->login1_session);
-        if (!session->priv->login1_session)
+        else if (session->priv->console_kit_cookie)
             ck_lock_session (session->priv->console_kit_cookie);
     }
 }
@@ -793,9 +793,9 @@
     g_return_if_fail (session != NULL);
     if (getuid () == 0)
     {
-        if (login1_is_running ())
+        if (session->priv->login1_session)
             login1_unlock_session (session->priv->login1_session);
-        if (!session->priv->login1_session)
+        else if (session->priv->console_kit_cookie)
             ck_unlock_session (session->priv->console_kit_cookie);
     }
 }
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-07-30 16:11:22 +0000
+++ tests/Makefile.am	2013-08-08 10:11:25 +0000
@@ -106,6 +106,8 @@
 	test-lock-session \
 	test-lock-session-no-password \
 	test-lock-session-return-session \
+	test-lock-seat-console-kit \
+	test-lock-seat-return-session-console-kit \
 	test-switch-to-greeter \
 	test-switch-to-greeter-new-session \
 	test-switch-to-greeter-new-session-logout-new \
@@ -321,7 +323,9 @@
 	scripts/language-env.conf \
 	scripts/language-no-accounts-service.conf \
 	scripts/lock-seat.conf \
+	scripts/lock-seat-console-kit.conf \    
 	scripts/lock-seat-return-session.conf \
+	scripts/lock-seat-return-session-console-kit.conf \
 	scripts/lock-session.conf \
 	scripts/lock-session-no-password.conf \
 	scripts/lock-session-return-session.conf \
 
=== added file 'tests/scripts/lock-seat-console-kit.conf'
--- tests/scripts/lock-seat-console-kit.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/lock-seat-console-kit.conf	2013-08-08 10:11:25 +0000
@@ -0,0 +1,59 @@
+#
+# Check can lock a seat from D-Bus using ConsoleKit
+#
+
+[test-runner-config]
+disable-login1=true
+
+[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 XDG_SESSION_COOKIE=ck-cookie-x:0 USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Lock the seat
+#?*SESSION-X-0 LOCK-SEAT
+#?SESSION-X-0 LOCK-SEAT
+
+# New X server starts
+#?XSERVER-1 START VT=8
+
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+
+# Session is locked
+#?CONSOLE-KIT LOCK-SESSION
+
+# Greeter starts
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-1 LOCK-HINT
+
+# Switch to greeter
+#?VT ACTIVATE VT=8
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
 
=== added file 'tests/scripts/lock-seat-return-session-console-kit.conf'
--- tests/scripts/lock-seat-return-session-console-kit.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/lock-seat-return-session-console-kit.conf	2013-08-08 10:11:25 +0000
@@ -0,0 +1,74 @@
+#
+# Check can lock a seat from D-Bus and can return to it when using ConsoleKit
+#
+
+[test-runner-config]
+disable-login1=true
+
+[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 XDG_SESSION_COOKIE=ck-cookie-x:0 USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# Lock the seat
+#?*SESSION-X-0 LOCK-SEAT
+#?SESSION-X-0 LOCK-SEAT
+
+# New X server starts
+#?XSERVER-1 START VT=8
+
+# Daemon connects when X server is ready
+#?*XSERVER-1 INDICATE-READY
+#?XSERVER-1 INDICATE-READY
+#?XSERVER-1 ACCEPT-CONNECT
+
+# Session is locked
+#?CONSOLE-KIT LOCK-SESSION
+
+# Greeter starts
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?XSERVER-1 ACCEPT-CONNECT
+#?GREETER-X-1 CONNECT-XSERVER
+#?GREETER-X-1 CONNECT-TO-DAEMON
+#?GREETER-X-1 CONNECTED-TO-DAEMON
+#?GREETER-X-1 LOCK-HINT
+
+# Switch to greeter
+#?VT ACTIVATE VT=8
+
+# Login as existing user
+#?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-1 RESPOND TEXT="password"
+#?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-1 START-SESSION
+
+# Old session is unlocked
+#?CONSOLE-KIT UNLOCK-SESSION
+
+# Return to session
+#?VT ACTIVATE VT=7
+
+# Greeter and X server stop
+#?GREETER-X-1 TERMINATE SIGNAL=15
+#?XSERVER-1 TERMINATE SIGNAL=15
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0
 
=== modified file 'tests/scripts/lock-seat-return-session.conf'
--- tests/scripts/lock-seat-return-session.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/lock-seat-return-session.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
@@ -51,6 +54,9 @@
 #?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
 #?*GREETER-X-1 START-SESSION
 
+# Old session is unlocked
+#?LOGIN1 UNLOCK-SESSION
+
 # Return to session
 #?VT ACTIVATE VT=7
 
 
=== modified file 'tests/scripts/lock-seat.conf'
--- tests/scripts/lock-seat.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/lock-seat.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
 
=== modified file 'tests/scripts/lock-session-no-password.conf'
--- tests/scripts/lock-session-no-password.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/lock-session-no-password.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts with session user selected
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
 
=== modified file 'tests/scripts/lock-session-return-session.conf'
--- tests/scripts/lock-session-return-session.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/lock-session-return-session.conf	2013-08-08 10:11:25 +0000
@@ -45,6 +45,9 @@
 # Switch to greeter
 #?VT ACTIVATE VT=8
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Login as existing user
 #?*GREETER-X-1 AUTHENTICATE USERNAME=have-password1
 #?GREETER-X-1 SHOW-PROMPT TEXT="Password:"
@@ -52,6 +55,9 @@
 #?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
 #?*GREETER-X-1 START-SESSION
 
+# Existing session is unlocked
+#?LOGIN1 UNLOCK-SESSION
+
 # Return to session
 #?VT ACTIVATE VT=7
 
 
=== modified file 'tests/scripts/lock-session.conf'
--- tests/scripts/lock-session.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/lock-session.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts with session user selected
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
 
=== modified file 'tests/scripts/switch-to-greeter-new-session-logout-new.conf'
--- tests/scripts/switch-to-greeter-new-session-logout-new.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/switch-to-greeter-new-session-logout-new.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
 
=== modified file 'tests/scripts/switch-to-greeter-new-session-logout-old.conf'
--- tests/scripts/switch-to-greeter-new-session-logout-old.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/switch-to-greeter-new-session-logout-old.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
@@ -60,6 +63,15 @@
 #?*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
+
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Logout of old session
 #?*SESSION-X-0 LOGOUT
 #?XSERVER-0 TERMINATE SIGNAL=15
@@ -77,9 +89,6 @@
 #?GREETER-X-0 CONNECT-TO-DAEMON
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
-# Switch to greeter
-#?VT ACTIVATE VT=7
-
 # Cleanup
 #?*STOP-DAEMON
 #?GREETER-X-0 TERMINATE SIGNAL=15
 
=== modified file 'tests/scripts/switch-to-greeter-new-session.conf'
--- tests/scripts/switch-to-greeter-new-session.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/switch-to-greeter-new-session.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
 
=== modified file 'tests/scripts/switch-to-greeter-return-session-logout.conf'
--- tests/scripts/switch-to-greeter-return-session-logout.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/switch-to-greeter-return-session-logout.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
@@ -50,6 +53,9 @@
 #?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
 #?*GREETER-X-1 START-SESSION
 
+# Session is unlocked
+#?LOGIN1 UNLOCK-SESSION
+
 # Switch to session
 #?VT ACTIVATE VT=7
 
 
=== modified file 'tests/scripts/switch-to-greeter-return-session.conf'
--- tests/scripts/switch-to-greeter-return-session.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/switch-to-greeter-return-session.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
@@ -50,6 +53,9 @@
 #?GREETER-X-1 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
 #?*GREETER-X-1 START-SESSION
 
+# Session is unlocked
+#?LOGIN1 UNLOCK-SESSION
+
 # Switch to session
 #?VT ACTIVATE VT=7
 
 
=== modified file 'tests/scripts/switch-to-greeter.conf'
--- tests/scripts/switch-to-greeter.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/switch-to-greeter.conf	2013-08-08 10:11:25 +0000
@@ -33,6 +33,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
 
=== modified file 'tests/scripts/switch-to-guest.conf'
--- tests/scripts/switch-to-guest.conf	2013-07-30 15:56:44 +0000
+++ tests/scripts/switch-to-guest.conf	2013-08-08 10:11:25 +0000
@@ -37,6 +37,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Switch to session
 #?VT ACTIVATE VT=8
 
 
=== modified file 'tests/scripts/switch-to-user-logout.conf'
--- tests/scripts/switch-to-user-logout.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/switch-to-user-logout.conf	2013-08-08 10:11:25 +0000
@@ -34,6 +34,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Switch to session
 #?VT ACTIVATE VT=8
 
 
=== modified file 'tests/scripts/switch-to-user-no-password.conf'
--- tests/scripts/switch-to-user-no-password.conf	2013-07-30 15:56:44 +0000
+++ tests/scripts/switch-to-user-no-password.conf	2013-08-08 10:11:25 +0000
@@ -34,6 +34,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Switch to session
 #?VT ACTIVATE VT=8
 
 
=== modified file 'tests/scripts/switch-to-user.conf'
--- tests/scripts/switch-to-user.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/switch-to-user.conf	2013-08-08 10:11:25 +0000
@@ -34,6 +34,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
 #?XSERVER-1 ACCEPT-CONNECT
 
=== modified file 'tests/scripts/switch-to-users.conf'
--- tests/scripts/switch-to-users.conf	2013-07-30 15:56:44 +0000
+++ tests/scripts/switch-to-users.conf	2013-08-08 10:11:25 +0000
@@ -34,6 +34,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # Switch to session
 #?VT ACTIVATE VT=8
 
@@ -57,6 +60,9 @@
 # Switch to session
 #?VT ACTIVATE VT=9
 
+# Session is locked
+#?LOGIN1 LOCK-SESSION
+
 # New session starts
 #?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 USER=no-password2
 #?XSERVER-2 ACCEPT-CONNECT
 
=== modified file 'tests/scripts/unity-switch.conf'
--- tests/scripts/unity-switch.conf	2013-07-30 16:11:22 +0000
+++ tests/scripts/unity-switch.conf	2013-08-08 10:11:25 +0000
@@ -41,6 +41,9 @@
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
 
+# Lock session
+#?LOGIN1 LOCK-SESSION
+
 # Greeter starts
 #?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7
 #?XSERVER-1 ACCEPT-CONNECT
 
=== modified file 'tests/src/test-runner.c'
--- tests/src/test-runner.c	2013-07-22 22:21:02 +0000
+++ tests/src/test-runner.c	2013-08-08 10:11:25 +0000
@@ -85,10 +85,11 @@
     gchar *cookie;
     gchar *path;
     guint id;
+    gboolean locked;
 } CKSession;
 static GList *ck_sessions = NULL;
 static gint ck_session_index = 0;
-static void handle_session_call (GDBusConnection       *connection,
+static void handle_ck_session_call (GDBusConnection       *connection,
                                     const gchar           *sender,
                                     const gchar           *object_path,
                                     const gchar           *interface_name,
@@ -98,13 +99,14 @@
                                     gpointer               user_data);
 static const GDBusInterfaceVTable ck_session_vtable =
 {
-    handle_session_call,
+    handle_ck_session_call,
 };
 
 typedef struct
 {
     gchar *path;
     guint pid;
+    gboolean locked;
 } Login1Session;
 
 static GList *login1_sessions = NULL;
@@ -1001,22 +1003,32 @@
         g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
 }
 
-
-/* Shared between CK and Login1 - identical signatures */
 static void
-handle_session_call (GDBusConnection       *connection,
-                     const gchar           *sender,
-                     const gchar           *object_path,
-                     const gchar           *interface_name,
-                     const gchar           *method_name,
-                     GVariant              *parameters,
-                     GDBusMethodInvocation *invocation,
-                     gpointer               user_data)
+handle_ck_session_call (GDBusConnection       *connection,
+                        const gchar           *sender,
+                        const gchar           *object_path,
+                        const gchar           *interface_name,
+                        const gchar           *method_name,
+                        GVariant              *parameters,
+                        GDBusMethodInvocation *invocation,
+                        gpointer               user_data)
 {
+    CKSession *session = user_data;
+
     if (strcmp (method_name, "Lock") == 0)
+    { 
+        if (!session->locked)
+            check_status ("CONSOLE-KIT LOCK-SESSION");
+        session->locked = TRUE;
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+    }
     else if (strcmp (method_name, "Unlock") == 0)
+    {
+        if (session->locked)
+            check_status ("CONSOLE-KIT UNLOCK-SESSION");
+        session->locked = FALSE;
         g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+    }
     else
         g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
 }
@@ -1118,6 +1130,36 @@
                     NULL);
 }
 
+static void
+handle_login1_session_call (GDBusConnection       *connection,
+                            const gchar           *sender,
+                            const gchar           *object_path,
+                            const gchar           *interface_name,
+                            const gchar           *method_name,
+                            GVariant              *parameters,
+                            GDBusMethodInvocation *invocation,
+                            gpointer               user_data)
+{
+    Login1Session *session = user_data;
+
+    if (strcmp (method_name, "Lock") == 0)
+    {
+        if (!session->locked)
+            check_status ("LOGIN1 LOCK-SESSION");
+        session->locked = TRUE;
+        g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+    }
+    else if (strcmp (method_name, "Unlock") == 0)
+    {
+        if (session->locked)
+            check_status ("LOGIN1 UNLOCK-SESSION");
+        session->locked = FALSE;
+        g_dbus_method_invocation_return_value (invocation, g_variant_new ("()"));
+    }
+    else
+        g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_FAILED, "No such method: %s", method_name);
+}
+
 static Login1Session *
 open_login1_session (GDBusConnection *connection,
                      GVariant *params)
@@ -1135,7 +1177,7 @@
         "</node>";
     static const GDBusInterfaceVTable login1_session_vtable =
     {
-        handle_session_call,
+        handle_login1_session_call,
     };
 
     session = g_malloc0 (sizeof (Login1Session));
 
=== added file 'tests/test-lock-seat-console-kit'
--- tests/test-lock-seat-console-kit	1970-01-01 00:00:00 +0000
+++ tests/test-lock-seat-console-kit	2013-08-08 10:11:25 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner lock-seat-console-kit test-gobject-greeter
 
=== added file 'tests/test-lock-seat-return-session-console-kit'
--- tests/test-lock-seat-return-session-console-kit	1970-01-01 00:00:00 +0000
+++ tests/test-lock-seat-return-session-console-kit	2013-08-08 10:11:25 +0000
@@ -0,0 +1,2 @@
+#!/bin/sh
+./src/dbus-env ./src/test-runner lock-seat-return-session-console-kit test-gobject-greeter