From: Lennart Poettering Date: Sun, 29 Jul 2012 15:08:47 +0000 (+0200) Subject: logind: add new loginctl lock-sessions command X-Git-Tag: v188~54 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=7212a8a99ee863698f5feaa00abb4b99f3996a1a;ds=sidebyside logind: add new loginctl lock-sessions command --- diff --git a/TODO b/TODO index 59ba7a2e1..16c429fb7 100644 --- 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 49fc1ffea..5c703a937 100644 --- a/man/loginctl.xml +++ b/man/loginctl.xml @@ -242,6 +242,14 @@ sessions, if the session supports it. + + lock-sessions + + Activate the screen + lock on all current sessions + supporting it. + + terminate-session [ID...] diff --git a/src/login/71-seat.rules.in b/src/login/71-seat.rules.in index 03005b6f1..f554d7f61 100644 --- 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 7b751e778..b80b2e6a9 100644 --- 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 },