logind: add new loginctl lock-sessions command

diff --git a/TODO b/TODO
index 59ba7a2e1439757793a4113f51a7c9537378d25b..16c429fb751a327892067b02528c8baf7e5cef43 100644 (file)
--- a/TODO
+++ b/TODO
@@ -39,6 +39,8 @@ Bugfixes:
 
 Features:
 
+* wiki: document new logind LockSessions() call
+
 * initialize the hostname from the fs label of /, if /etc/hostname does not exist?
 
 * logind: different policy actions for idle, suspend, shutdown blockers: allow idle blockers by default, don't allow suspend blockers by default

diff --git a/man/loginctl.xml b/man/loginctl.xml
index 49fc1ffeac2abf248a561f55941a75f3875263a0..5c703a937d6d20fadf4ac3ea55bad5925bdf78e1 100644 (file)
--- a/man/loginctl.xml
+++ b/man/loginctl.xml
@@ -242,6 +242,14 @@
                                 sessions, if the session supports it.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><command>lock-sessions</command></term>
+
+                                <listitem><para>Activate the screen
+                                lock on all current sessions
+                                supporting it.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><command>terminate-session [ID...]</command></term>
 

diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in
index 03005b6f1c4ce1bc786722de0de874069f2f6263..f554d7f6151b89372de1c7fcdbd68ee25a574af0 100644 (file)
--- a/src/login/71-seat.rules.in
+++ b/src/login/71-seat.rules.in
@@ -43,4 +43,6 @@ SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{idProduct}=="401a", ATTR{product}
 TAG=="seat", ENV{ID_PATH}=="", IMPORT{builtin}="path_id"
 TAG=="seat", ENV{ID_FOR_SEAT}=="", ENV{ID_PATH_TAG}!="", ENV{ID_FOR_SEAT}="$env{SUBSYSTEM}-$env{ID_PATH_TAG}"
 
+SUBSYSTEM=="input", ATTR{name}=="Wiebetech LLC Wiebetech", RUN+="@rootbindir@/loginctl lock-sessions"
+
 LABEL="seat_end"

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 7b751e778fa29d4dc826d28b339de115da4e78b7..b80b2e6a9f791dbbfc126d6e15fcd9be7dbd3551 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1604,6 +1604,48 @@ finish:
         return ret;
 }
 
+static int lock_sessions(DBusConnection *bus, char **args, unsigned n) {
+        DBusMessage *m = NULL, *reply = NULL;
+        int ret = 0;
+        DBusError error;
+
+        assert(bus);
+        assert(args);
+
+        dbus_error_init(&error);
+
+        polkit_agent_open_if_enabled();
+
+        m = dbus_message_new_method_call(
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "LockSessions");
+        if (!m) {
+                log_error("Could not allocate message.");
+                ret = -ENOMEM;
+                goto finish;
+        }
+
+        reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
+        if (!reply) {
+                log_error("Failed to issue method call: %s", bus_error_message(&error));
+                ret = -EIO;
+                goto finish;
+        }
+
+finish:
+        if (m)
+                dbus_message_unref(m);
+
+        if (reply)
+                dbus_message_unref(reply);
+
+        dbus_error_free(&error);
+
+        return ret;
+}
+
 static int terminate_seat(DBusConnection *bus, char **args, unsigned n) {
         DBusMessage *m = NULL;
         int ret = 0;
@@ -1679,6 +1721,7 @@ static int help(void) {
                "  activate [ID]                   Activate a session\n"
                "  lock-session [ID...]            Screen lock one or more sessions\n"
                "  unlock-session [ID...]          Screen unlock one or more sessions\n"
+               "  lock-sessions                   Screen lock all current sessions\n"
                "  terminate-session [ID...]       Terminate one or more sessions\n"
                "  kill-session [ID...]            Send signal to processes of a session\n"
                "  list-users                      List users\n"
@@ -1820,6 +1863,7 @@ static int loginctl_main(DBusConnection *bus, int argc, char *argv[], DBusError
                 { "activate",              EQUAL,  2, activate         },
                 { "lock-session",          MORE,   2, activate         },
                 { "unlock-session",        MORE,   2, activate         },
+                { "lock-sessions",         EQUAL,  1, lock_sessions    },
                 { "terminate-session",     MORE,   2, activate         },
                 { "kill-session",          MORE,   2, kill_session     },
                 { "list-users",            EQUAL,  1, list_users       },