chiark / gitweb /
Prep v225: Applying various fixes and changes to src/login that got lost during git...
[elogind.git] / src / login / loginctl.c
index 30e97e352af09a2556ed34703ffa33e7bdbd2332..cf4ca46631c629f2fdc0a37793a6a9ef481e3089 100644 (file)
   Copyright 2010 Lennart Poettering
 
   systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
 
   systemd is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
+  Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <dbus/dbus.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>
-#include <pwd.h>
+#include <locale.h>
 
+#include "sd-bus.h"
+#include "sd-login.h"
+#include "bus-util.h"
+#include "bus-error.h"
 #include "log.h"
 #include "util.h"
 #include "macro.h"
 #include "pager.h"
-#include "dbus-common.h"
 #include "build.h"
 #include "strv.h"
-#include "cgroup-show.h"
+#include "unit-name.h"
 #include "sysfs-show.h"
+// #include "logs-show.h"
+#include "cgroup-show.h"
+#include "cgroup-util.h"
+#include "spawn-polkit-agent.h"
+#include "verbs.h"
+#include "process-util.h"
+#include "terminal-util.h"
+#include "signal-util.h"
 
 static char **arg_property = NULL;
 static bool arg_all = false;
+static bool arg_full = false;
 static bool arg_no_pager = false;
+static bool arg_legend = true;
 static const char *arg_kill_who = NULL;
 static int arg_signal = SIGTERM;
-static enum transport {
-        TRANSPORT_NORMAL,
-        TRANSPORT_SSH,
-        TRANSPORT_POLKIT
-} arg_transport = TRANSPORT_NORMAL;
-static const char *arg_host = NULL;
-
-static bool on_tty(void) {
-        static int t = -1;
-
-        /* Note that this is invoked relatively early, before we start
-         * the pager. That means the value we return reflects whether
-         * we originally were started on a tty, not if we currently
-         * are. But this is intended, since we want colour and so on
-         * when run in our own pager. */
-
-        if (_unlikely_(t < 0))
-                t = isatty(STDOUT_FILENO) > 0;
-
-        return t;
-}
+static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
+static char *arg_host = NULL;
+static bool arg_ask_password = true;
+#if 0
+static unsigned arg_lines = 10;
+static OutputMode arg_output = OUTPUT_SHORT;
+#endif // 0
 
 static void pager_open_if_enabled(void) {
 
-        /* Cache result before we open the pager */
-        on_tty();
+        if (arg_no_pager)
+                return;
 
-        if (!arg_no_pager)
-                pager_open();
+        pager_open(false);
 }
 
-static int list_sessions(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL, *reply = NULL;
-        DBusError error;
-        int r;
-        DBusMessageIter iter, sub, sub2;
-        unsigned k = 0;
+static void polkit_agent_open_if_enabled(void) {
+
+        /* Open the polkit agent as a child process if necessary */
+
+        if (!arg_ask_password)
+                return;
+
+        if (arg_transport != BUS_TRANSPORT_LOCAL)
+                return;
 
-        dbus_error_init(&error);
+        polkit_agent_open();
+}
+
+static OutputFlags get_output_flags(void) {
+
+        return
+                arg_all * OUTPUT_SHOW_ALL |
+                arg_full * OUTPUT_FULL_WIDTH |
+                (!on_tty() || pager_have()) * OUTPUT_FULL_WIDTH |
+                on_tty() * OUTPUT_COLOR;
+}
+
+static int list_sessions(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        const char *id, *user, *seat, *object;
+        sd_bus *bus = userdata;
+        unsigned k = 0;
+        uint32_t uid;
+        int r;
 
         assert(bus);
+        assert(argv);
 
         pager_open_if_enabled();
 
-        m = dbus_message_new_method_call(
+        r = sd_bus_call_method(
+                        bus,
                         "org.freedesktop.login1",
                         "/org/freedesktop/login1",
                         "org.freedesktop.login1.Manager",
-                        "ListSessions");
-        if (!m) {
-                log_error("Could not allocate message.");
-                return -ENOMEM;
-        }
-
-        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));
-                r = -EIO;
-                goto finish;
+                        "ListSessions",
+                        &error, &reply,
+                        "");
+        if (r < 0) {
+                log_error("Failed to list sessions: %s", bus_error_message(&error, r));
+                return r;
         }
 
-        if (!dbus_message_iter_init(reply, &iter) ||
-            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
-            dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_STRUCT)  {
-                log_error("Failed to parse reply.");
-                r = -EIO;
-                goto finish;
-        }
-
-        dbus_message_iter_recurse(&iter, &sub);
+        r = sd_bus_message_enter_container(reply, 'a', "(susso)");
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-        if (on_tty())
+        if (arg_legend)
                 printf("%10s %10s %-16s %-16s\n", "SESSION", "UID", "USER", "SEAT");
 
-        while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
-                const char *id, *user, *seat, *object;
-                uint32_t uid;
-
-                if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_iter_recurse(&sub, &sub2);
-
-                if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &id, true) < 0 ||
-                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &uid, true) < 0 ||
-                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &user, true) < 0 ||
-                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &seat, true) < 0 ||
-                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &object, false) < 0) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
+        while ((r = sd_bus_message_read(reply, "(susso)", &id, &uid, &user, &seat, &object)) > 0) {
                 printf("%10s %10u %-16s %-16s\n", id, (unsigned) uid, user, seat);
-
                 k++;
-
-                dbus_message_iter_next(&sub);
         }
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-        if (on_tty())
+        if (arg_legend)
                 printf("\n%u sessions listed.\n", k);
 
-        r = 0;
-
-finish:
-        if (m)
-                dbus_message_unref(m);
-
-        if (reply)
-                dbus_message_unref(reply);
-
-        dbus_error_free(&error);
-
-        return r;
+        return 0;
 }
 
-static int list_users(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL, *reply = NULL;
-        DBusError error;
-        int r;
-        DBusMessageIter iter, sub, sub2;
+static int list_users(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        const char *user, *object;
+        sd_bus *bus = userdata;
         unsigned k = 0;
-
-        dbus_error_init(&error);
+        uint32_t uid;
+        int r;
 
         assert(bus);
+        assert(argv);
 
         pager_open_if_enabled();
 
-        m = dbus_message_new_method_call(
+        r = sd_bus_call_method(
+                        bus,
                         "org.freedesktop.login1",
                         "/org/freedesktop/login1",
                         "org.freedesktop.login1.Manager",
-                        "ListUsers");
-        if (!m) {
-                log_error("Could not allocate message.");
-                return -ENOMEM;
-        }
-
-        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));
-                r = -EIO;
-                goto finish;
+                        "ListUsers",
+                        &error, &reply,
+                        "");
+        if (r < 0) {
+                log_error("Failed to list users: %s", bus_error_message(&error, r));
+                return r;
         }
 
-        if (!dbus_message_iter_init(reply, &iter) ||
-            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
-            dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_STRUCT)  {
-                log_error("Failed to parse reply.");
-                r = -EIO;
-                goto finish;
-        }
-
-        dbus_message_iter_recurse(&iter, &sub);
+        r = sd_bus_message_enter_container(reply, 'a', "(uso)");
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-        if (on_tty())
+        if (arg_legend)
                 printf("%10s %-16s\n", "UID", "USER");
 
-        while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
-                const char *user, *object;
-                uint32_t uid;
-
-                if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_iter_recurse(&sub, &sub2);
-
-                if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_UINT32, &uid, true) < 0 ||
-                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &user, true) < 0 ||
-                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &object, false) < 0) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
+        while ((r = sd_bus_message_read(reply, "(uso)", &uid, &user, &object)) > 0) {
                 printf("%10u %-16s\n", (unsigned) uid, user);
-
                 k++;
-
-                dbus_message_iter_next(&sub);
         }
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-        if (on_tty())
+        if (arg_legend)
                 printf("\n%u users listed.\n", k);
 
-        r = 0;
-
-finish:
-        if (m)
-                dbus_message_unref(m);
-
-        if (reply)
-                dbus_message_unref(reply);
-
-        dbus_error_free(&error);
-
-        return r;
+        return 0;
 }
 
-static int list_seats(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL, *reply = NULL;
-        DBusError error;
-        int r;
-        DBusMessageIter iter, sub, sub2;
+static int list_seats(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        const char *seat, *object;
+        sd_bus *bus = userdata;
         unsigned k = 0;
-
-        dbus_error_init(&error);
+        int r;
 
         assert(bus);
+        assert(argv);
 
         pager_open_if_enabled();
 
-        m = dbus_message_new_method_call(
+        r = sd_bus_call_method(
+                        bus,
                         "org.freedesktop.login1",
                         "/org/freedesktop/login1",
                         "org.freedesktop.login1.Manager",
-                        "ListSeats");
-        if (!m) {
-                log_error("Could not allocate message.");
-                return -ENOMEM;
-        }
-
-        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));
-                r = -EIO;
-                goto finish;
+                        "ListSeats",
+                        &error, &reply,
+                        "");
+        if (r < 0) {
+                log_error("Failed to list seats: %s", bus_error_message(&error, r));
+                return r;
         }
 
-        if (!dbus_message_iter_init(reply, &iter) ||
-            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
-            dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_STRUCT)  {
-                log_error("Failed to parse reply.");
-                r = -EIO;
-                goto finish;
-        }
-
-        dbus_message_iter_recurse(&iter, &sub);
+        r = sd_bus_message_enter_container(reply, 'a', "(so)");
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-        if (on_tty())
+        if (arg_legend)
                 printf("%-16s\n", "SEAT");
 
-        while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
-                const char *seat, *object;
+        while ((r = sd_bus_message_read(reply, "(so)", &seat, &object)) > 0) {
+                printf("%-16s\n", seat);
+                k++;
+        }
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-                if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
+        if (arg_legend)
+                printf("\n%u seats listed.\n", k);
 
-                dbus_message_iter_recurse(&sub, &sub2);
+        return 0;
+}
 
-                if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &seat, true) < 0 ||
-                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &object, false) < 0) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
+static int show_unit_cgroup(sd_bus *bus, const char *interface, const char *unit, pid_t leader) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        _cleanup_free_ char *path = NULL;
+        const char *cgroup;
+        int r;
+        unsigned c;
 
-                printf("%-16s\n", seat);
+        assert(bus);
+        assert(unit);
 
-                k++;
+        if (arg_transport != BUS_TRANSPORT_LOCAL)
+                return 0;
 
-                dbus_message_iter_next(&sub);
-        }
+        path = unit_dbus_path_from_name(unit);
+        if (!path)
+                return -ENOMEM;
 
-        if (on_tty())
-                printf("\n%u seats listed.\n", k);
+        r = sd_bus_get_property(
+                        bus,
+                        "org.freedesktop.systemd1",
+                        path,
+                        interface,
+                        "ControlGroup",
+                        &error, &reply, "s");
+        if (r < 0)
+                return r;
 
-        r = 0;
+        r = sd_bus_message_read(reply, "s", &cgroup);
+        if (r < 0)
+                return r;
 
-finish:
-        if (m)
-                dbus_message_unref(m);
+        if (isempty(cgroup))
+                return 0;
 
-        if (reply)
-                dbus_message_unref(reply);
+        if (cg_is_empty_recursive(ELOGIND_CGROUP_CONTROLLER, cgroup, false) != 0 && leader <= 0)
+                return 0;
 
-        dbus_error_free(&error);
+        c = columns();
+        if (c > 18)
+                c -= 18;
+        else
+                c = 0;
 
-        return r;
+        show_cgroup_and_extra(ELOGIND_CGROUP_CONTROLLER, cgroup, "\t\t  ", c, false, &leader, leader > 0, get_output_flags());
+        return 0;
 }
 
 typedef struct SessionStatusInfo {
-        const char *id;
+        char *id;
         uid_t uid;
-        const char *name;
-        usec_t timestamp;
-        const char *control_group;
-        int vtnr;
-        const char *seat;
-        const char *tty;
-        const char *display;
+        char *name;
+        struct dual_timestamp timestamp;
+        unsigned int vtnr;
+        char *seat;
+        char *tty;
+        char *display;
         bool remote;
-        const char *remote_host;
-        const char *remote_user;
-        const char *service;
+        char *remote_host;
+        char *remote_user;
+        char *service;
         pid_t leader;
-        const char *type;
-        const char *class;
-        bool active;
+        char *type;
+        char *class;
+        char *state;
+        char *scope;
+        char *desktop;
 } SessionStatusInfo;
 
 typedef struct UserStatusInfo {
         uid_t uid;
-        const char *name;
-        usec_t timestamp;
-        const char *control_group;
-        const char *state;
+        char *name;
+        struct dual_timestamp timestamp;
+        char *state;
         char **sessions;
-        const char *display;
+        char *display;
+        char *slice;
 } UserStatusInfo;
 
 typedef struct SeatStatusInfo {
-        const char *id;
-        const char *active_session;
+        char *id;
+        char *active_session;
         char **sessions;
 } SeatStatusInfo;
 
-static void print_session_status_info(SessionStatusInfo *i) {
-        char since1[FORMAT_TIMESTAMP_PRETTY_MAX], *s1;
+static void session_status_info_clear(SessionStatusInfo *info) {
+        if (info) {
+                free(info->id);
+                free(info->name);
+                free(info->seat);
+                free(info->tty);
+                free(info->display);
+                free(info->remote_host);
+                free(info->remote_user);
+                free(info->service);
+                free(info->type);
+                free(info->class);
+                free(info->state);
+                free(info->scope);
+                free(info->desktop);
+                zero(*info);
+        }
+}
+
+static void user_status_info_clear(UserStatusInfo *info) {
+        if (info) {
+                free(info->name);
+                free(info->state);
+                strv_free(info->sessions);
+                free(info->display);
+                free(info->slice);
+                zero(*info);
+        }
+}
+
+static void seat_status_info_clear(SeatStatusInfo *info) {
+        if (info) {
+                free(info->id);
+                free(info->active_session);
+                strv_free(info->sessions);
+                zero(*info);
+        }
+}
+
+static int prop_map_first_of_struct(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
+        const char *contents;
+        int r;
+
+        r = sd_bus_message_peek_type(m, NULL, &contents);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_enter_container(m, SD_BUS_TYPE_STRUCT, contents);
+        if (r < 0)
+                return r;
+
+        if (contents[0] == 's' || contents[0] == 'o') {
+                const char *s;
+                char **p = (char **) userdata;
+
+                r = sd_bus_message_read_basic(m, contents[0], &s);
+                if (r < 0)
+                        return r;
+
+                r = free_and_strdup(p, s);
+                if (r < 0)
+                        return r;
+        } else {
+                r = sd_bus_message_read_basic(m, contents[0], userdata);
+                if (r < 0)
+                        return r;
+        }
+
+        r = sd_bus_message_skip(m, contents+1);
+        if (r < 0)
+                return r;
+
+        r = sd_bus_message_exit_container(m);
+        if (r < 0)
+                return r;
+
+        return 0;
+}
+
+static int prop_map_sessions_strv(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata) {
+        const char *name;
+        int r;
+
+        assert(bus);
+        assert(m);
+
+        r = sd_bus_message_enter_container(m, 'a', "(so)");
+        if (r < 0)
+                return r;
+
+        while ((r = sd_bus_message_read(m, "(so)", &name, NULL)) > 0) {
+                r = strv_extend(userdata, name);
+                if (r < 0)
+                        return r;
+        }
+        if (r < 0)
+                return r;
+
+        return sd_bus_message_exit_container(m);
+}
+
+static int print_session_status_info(sd_bus *bus, const char *path, bool *new_line) {
+
+        static const struct bus_properties_map map[]  = {
+                { "Id",                  "s",    NULL,                     offsetof(SessionStatusInfo, id)                  },
+                { "Name",                "s",    NULL,                     offsetof(SessionStatusInfo, name)                },
+                { "TTY",                 "s",    NULL,                     offsetof(SessionStatusInfo, tty)                 },
+                { "Display",             "s",    NULL,                     offsetof(SessionStatusInfo, display)             },
+                { "RemoteHost",          "s",    NULL,                     offsetof(SessionStatusInfo, remote_host)         },
+                { "RemoteUser",          "s",    NULL,                     offsetof(SessionStatusInfo, remote_user)         },
+                { "Service",             "s",    NULL,                     offsetof(SessionStatusInfo, service)             },
+                { "Desktop",             "s",    NULL,                     offsetof(SessionStatusInfo, desktop)             },
+                { "Type",                "s",    NULL,                     offsetof(SessionStatusInfo, type)                },
+                { "Class",               "s",    NULL,                     offsetof(SessionStatusInfo, class)               },
+                { "Scope",               "s",    NULL,                     offsetof(SessionStatusInfo, scope)               },
+                { "State",               "s",    NULL,                     offsetof(SessionStatusInfo, state)               },
+                { "VTNr",                "u",    NULL,                     offsetof(SessionStatusInfo, vtnr)                },
+                { "Leader",              "u",    NULL,                     offsetof(SessionStatusInfo, leader)              },
+                { "Remote",              "b",    NULL,                     offsetof(SessionStatusInfo, remote)              },
+                { "Timestamp",           "t",    NULL,                     offsetof(SessionStatusInfo, timestamp.realtime)  },
+                { "TimestampMonotonic",  "t",    NULL,                     offsetof(SessionStatusInfo, timestamp.monotonic) },
+                { "User",                "(uo)", prop_map_first_of_struct, offsetof(SessionStatusInfo, uid)                 },
+                { "Seat",                "(so)", prop_map_first_of_struct, offsetof(SessionStatusInfo, seat)                },
+                {}
+        };
+
+        char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1;
         char since2[FORMAT_TIMESTAMP_MAX], *s2;
-        assert(i);
+        _cleanup_(session_status_info_clear) SessionStatusInfo i = {};
+        int r;
+
+        r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
+        if (r < 0)
+                return log_error_errno(r, "Could not get properties: %m");
+
+        if (*new_line)
+                printf("\n");
+
+        *new_line = true;
 
-        printf("%s - ", strna(i->id));
+        printf("%s - ", strna(i.id));
 
-        if (i->name)
-                printf("%s (%u)\n", i->name, (unsigned) i->uid);
+        if (i.name)
+                printf("%s (%u)\n", i.name, (unsigned) i.uid);
         else
-                printf("%u\n", (unsigned) i->uid);
+                printf("%u\n", (unsigned) i.uid);
 
-        s1 = format_timestamp_pretty(since1, sizeof(since1), i->timestamp);
-        s2 = format_timestamp(since2, sizeof(since2), i->timestamp);
+        s1 = format_timestamp_relative(since1, sizeof(since1), i.timestamp.realtime);
+        s2 = format_timestamp(since2, sizeof(since2), i.timestamp.realtime);
 
         if (s1)
                 printf("\t   Since: %s; %s\n", s2, s1);
         else if (s2)
                 printf("\t   Since: %s\n", s2);
 
-        if (i->leader > 0) {
-                char *t = NULL;
+        if (i.leader > 0) {
+                _cleanup_free_ char *t = NULL;
 
-                printf("\t  Leader: %u", (unsigned) i->leader);
+                printf("\t  Leader: %u", (unsigned) i.leader);
 
-                get_process_comm(i->leader, &t);
-                if (t) {
+                get_process_comm(i.leader, &t);
+                if (t)
                         printf(" (%s)", t);
-                        free(t);
-                }
 
                 printf("\n");
         }
 
-        if (i->seat) {
-                printf("\t    Seat: %s", i->seat);
+        if (!isempty(i.seat)) {
+                printf("\t    Seat: %s", i.seat);
 
-                if (i->vtnr > 0)
-                        printf("; vc%i", i->vtnr);
+                if (i.vtnr > 0)
+                        printf("; vc%u", i.vtnr);
 
                 printf("\n");
         }
 
-        if (i->tty)
-                printf("\t     TTY: %s\n", i->tty);
-        else if (i->display)
-                printf("\t Display: %s\n", i->display);
-
-        if (i->remote_host && i->remote_user)
-                printf("\t  Remote: %s@%s\n", i->remote_user, i->remote_host);
-        else if (i->remote_host)
-                printf("\t  Remote: %s\n", i->remote_host);
-        else if (i->remote_user)
-                printf("\t  Remote: user %s\n", i->remote_user);
-        else if (i->remote)
+        if (i.tty)
+                printf("\t     TTY: %s\n", i.tty);
+        else if (i.display)
+                printf("\t Display: %s\n", i.display);
+
+        if (i.remote_host && i.remote_user)
+                printf("\t  Remote: %s@%s\n", i.remote_user, i.remote_host);
+        else if (i.remote_host)
+                printf("\t  Remote: %s\n", i.remote_host);
+        else if (i.remote_user)
+                printf("\t  Remote: user %s\n", i.remote_user);
+        else if (i.remote)
                 printf("\t  Remote: Yes\n");
 
-        if (i->service) {
-                printf("\t Service: %s", i->service);
+        if (i.service) {
+                printf("\t Service: %s", i.service);
 
-                if (i->type)
-                        printf("; type %s", i->type);
+                if (i.type)
+                        printf("; type %s", i.type);
 
-                if (i->class)
-                        printf("; class %s", i->class);
+                if (i.class)
+                        printf("; class %s", i.class);
 
                 printf("\n");
-        } else if (i->type) {
-                printf("\t    Type: %s\n", i->type);
+        } else if (i.type) {
+                printf("\t    Type: %s", i.type);
 
-                if (i->class)
-                        printf("; class %s", i->class);
-        } else if (i->class)
-                printf("\t   Class: %s\n", i->class);
+                if (i.class)
+                        printf("; class %s", i.class);
 
+                printf("\n");
+        } else if (i.class)
+                printf("\t   Class: %s\n", i.class);
+
+        if (!isempty(i.desktop))
+                printf("\t Desktop: %s\n", i.desktop);
+
+        if (i.state)
+                printf("\t   State: %s\n", i.state);
+
+        if (i.scope) {
+                printf("\t    Unit: %s\n", i.scope);
+                show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader);
+#if 0
+                if (arg_transport == BUS_TRANSPORT_LOCAL) {
+
+                        show_journal_by_unit(
+                                        stdout,
+                                        i.scope,
+                                        arg_output,
+                                        0,
+                                        i.timestamp.monotonic,
+                                        arg_lines,
+                                        0,
+                                        get_output_flags() | OUTPUT_BEGIN_NEWLINE,
+                                        SD_JOURNAL_LOCAL_ONLY,
+                                        true,
+                                        NULL);
+                }
 
-        printf("\t  Active: %s\n", yes_no(i->active));
+#endif // 0
+        }
 
-        if (i->control_group) {
-                unsigned c;
+        return 0;
+}
 
-                printf("\t  CGroup: %s\n", i->control_group);
+static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line) {
+
+        static const struct bus_properties_map map[]  = {
+                { "Name",               "s",     NULL,                     offsetof(UserStatusInfo, name)                },
+                { "Slice",              "s",     NULL,                     offsetof(UserStatusInfo, slice)               },
+                { "State",              "s",     NULL,                     offsetof(UserStatusInfo, state)               },
+                { "UID",                "u",     NULL,                     offsetof(UserStatusInfo, uid)                 },
+                { "Timestamp",          "t",     NULL,                     offsetof(UserStatusInfo, timestamp.realtime)  },
+                { "TimestampMonotonic", "t",     NULL,                     offsetof(UserStatusInfo, timestamp.monotonic) },
+                { "Display",            "(so)",  prop_map_first_of_struct, offsetof(UserStatusInfo, display)             },
+                { "Sessions",           "a(so)", prop_map_sessions_strv,   offsetof(UserStatusInfo, sessions)            },
+                {}
+        };
 
-                if (arg_transport != TRANSPORT_SSH) {
-                        c = columns();
-                        if (c > 18)
-                                c -= 18;
-                        else
-                                c = 0;
+        char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1;
+        char since2[FORMAT_TIMESTAMP_MAX], *s2;
+        _cleanup_(user_status_info_clear) UserStatusInfo i = {};
+        int r;
 
-                        show_cgroup_by_path(i->control_group, "\t\t  ", c, false);
-                }
-        }
-}
+        r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
+        if (r < 0)
+                return log_error_errno(r, "Could not get properties: %m");
 
-static void print_user_status_info(UserStatusInfo *i) {
-        char since1[FORMAT_TIMESTAMP_PRETTY_MAX], *s1;
-        char since2[FORMAT_TIMESTAMP_MAX], *s2;
-        assert(i);
+        if (*new_line)
+                printf("\n");
+
+        *new_line = true;
 
-        if (i->name)
-                printf("%s (%u)\n", i->name, (unsigned) i->uid);
+        if (i.name)
+                printf("%s (%u)\n", i.name, (unsigned) i.uid);
         else
-                printf("%u\n", (unsigned) i->uid);
+                printf("%u\n", (unsigned) i.uid);
 
-        s1 = format_timestamp_pretty(since1, sizeof(since1), i->timestamp);
-        s2 = format_timestamp(since2, sizeof(since2), i->timestamp);
+        s1 = format_timestamp_relative(since1, sizeof(since1), i.timestamp.realtime);
+        s2 = format_timestamp(since2, sizeof(since2), i.timestamp.realtime);
 
         if (s1)
                 printf("\t   Since: %s; %s\n", s2, s1);
         else if (s2)
                 printf("\t   Since: %s\n", s2);
 
-        if (!isempty(i->state))
-                printf("\t   State: %s\n", i->state);
+        if (!isempty(i.state))
+                printf("\t   State: %s\n", i.state);
 
-        if (!strv_isempty(i->sessions)) {
+        if (!strv_isempty(i.sessions)) {
                 char **l;
                 printf("\tSessions:");
 
-                STRV_FOREACH(l, i->sessions) {
-                        if (streq_ptr(*l, i->display))
+                STRV_FOREACH(l, i.sessions) {
+                        if (streq_ptr(*l, i.display))
                                 printf(" *%s", *l);
                         else
                                 printf(" %s", *l);
@@ -499,34 +616,58 @@ static void print_user_status_info(UserStatusInfo *i) {
                 printf("\n");
         }
 
-        if (i->control_group) {
-                unsigned c;
+        if (i.slice) {
+                printf("\t    Unit: %s\n", i.slice);
+                show_unit_cgroup(bus, "org.freedesktop.systemd1.Slice", i.slice, 0);
+#if 0
+                show_journal_by_unit(
+                                stdout,
+                                i.slice,
+                                arg_output,
+                                0,
+                                i.timestamp.monotonic,
+                                arg_lines,
+                                0,
+                                get_output_flags() | OUTPUT_BEGIN_NEWLINE,
+                                SD_JOURNAL_LOCAL_ONLY,
+                                true,
+                                NULL);
+
+#endif // 0
+        }
 
-                printf("\t  CGroup: %s\n", i->control_group);
+        return 0;
+}
 
-                if (arg_transport != TRANSPORT_SSH) {
-                        c = columns();
-                        if (c > 18)
-                                c -= 18;
-                        else
-                                c = 0;
+static int print_seat_status_info(sd_bus *bus, const char *path, bool *new_line) {
 
-                        show_cgroup_by_path(i->control_group, "\t\t  ", c, false);
-                }
-        }
-}
+        static const struct bus_properties_map map[]  = {
+                { "Id",            "s",     NULL, offsetof(SeatStatusInfo, id) },
+                { "ActiveSession", "(so)",  prop_map_first_of_struct, offsetof(SeatStatusInfo, active_session) },
+                { "Sessions",      "a(so)", prop_map_sessions_strv, offsetof(SeatStatusInfo, sessions) },
+                {}
+        };
 
-static void print_seat_status_info(SeatStatusInfo *i) {
-        assert(i);
+        _cleanup_(seat_status_info_clear) SeatStatusInfo i = {};
+        int r;
+
+        r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
+        if (r < 0)
+                return log_error_errno(r, "Could not get properties: %m");
+
+        if (*new_line)
+                printf("\n");
+
+        *new_line = true;
 
-        printf("%s\n", strna(i->id));
+        printf("%s\n", strna(i.id));
 
-        if (!strv_isempty(i->sessions)) {
+        if (!strv_isempty(i.sessions)) {
                 char **l;
                 printf("\tSessions:");
 
-                STRV_FOREACH(l, i->sessions) {
-                        if (streq_ptr(*l, i->active_session))
+                STRV_FOREACH(l, i.sessions) {
+                        if (streq_ptr(*l, i.active_session))
                                 printf(" *%s", *l);
                         else
                                 printf(" %s", *l);
@@ -535,7 +676,7 @@ static void print_seat_status_info(SeatStatusInfo *i) {
                 printf("\n");
         }
 
-        if (arg_transport != TRANSPORT_SSH) {
+        if (arg_transport == BUS_TRANSPORT_LOCAL) {
                 unsigned c;
 
                 c = columns();
@@ -546,1135 +687,797 @@ static void print_seat_status_info(SeatStatusInfo *i) {
 
                 printf("\t Devices:\n");
 
-                show_sysfs(i->id, "\t\t  ", c);
+                show_sysfs(i.id, "\t\t  ", c);
         }
-}
 
-static int status_property_session(const char *name, DBusMessageIter *iter, SessionStatusInfo *i) {
-        assert(name);
-        assert(iter);
-        assert(i);
+        return 0;
+}
 
-        switch (dbus_message_iter_get_arg_type(iter)) {
+static int show_properties(sd_bus *bus, const char *path, bool *new_line) {
+        int r;
 
-        case DBUS_TYPE_STRING: {
-                const char *s;
+        if (*new_line)
+                printf("\n");
 
-                dbus_message_iter_get_basic(iter, &s);
-
-                if (!isempty(s)) {
-                        if (streq(name, "Id"))
-                                i->id = s;
-                        else if (streq(name, "Name"))
-                                i->name = s;
-                        else if (streq(name, "ControlGroupPath"))
-                                i->control_group = s;
-                        else if (streq(name, "TTY"))
-                                i->tty = s;
-                        else if (streq(name, "Display"))
-                                i->display = s;
-                        else if (streq(name, "RemoteHost"))
-                                i->remote_host = s;
-                        else if (streq(name, "RemoteUser"))
-                                i->remote_user = s;
-                        else if (streq(name, "Service"))
-                                i->service = s;
-                        else if (streq(name, "Type"))
-                                i->type = s;
-                        else if (streq(name, "Class"))
-                                i->class = s;
-                }
-                break;
-        }
+        *new_line = true;
 
-        case DBUS_TYPE_UINT32: {
-                uint32_t u;
+        r = bus_print_all_properties(bus, "org.freedesktop.login1", path, arg_property, arg_all);
+        if (r < 0)
+                log_error_errno(r, "Could not get properties: %m");
 
-                dbus_message_iter_get_basic(iter, &u);
+        return r;
+}
 
-                if (streq(name, "VTNr"))
-                        i->vtnr = (int) u;
-                else if (streq(name, "Leader"))
-                        i->leader = (pid_t) u;
+static int show_session(int argc, char *argv[], void *userdata) {
+        bool properties, new_line = false;
+        sd_bus *bus = userdata;
+        int r, i;
 
-                break;
-        }
+        assert(bus);
+        assert(argv);
 
-        case DBUS_TYPE_BOOLEAN: {
-                dbus_bool_t b;
+        properties = !strstr(argv[0], "status");
 
-                dbus_message_iter_get_basic(iter, &b);
+        pager_open_if_enabled();
 
-                if (streq(name, "Remote"))
-                        i->remote = b;
-                else if (streq(name, "Active"))
-                        i->active = b;
+        if (argc <= 1) {
+                /* If not argument is specified inspect the manager
+                 * itself */
+                if (properties)
+                        return show_properties(bus, "/org/freedesktop/login1", &new_line);
 
-                break;
+                /* And in the pretty case, show data of the calling session */
+                return print_session_status_info(bus, "/org/freedesktop/login1/session/self", &new_line);
         }
 
-        case DBUS_TYPE_UINT64: {
-                uint64_t u;
+        for (i = 1; i < argc; i++) {
+                _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+                _cleanup_bus_message_unref_ sd_bus_message * reply = NULL;
+                const char *path = NULL;
+
+                r = sd_bus_call_method(
+                                bus,
+                                "org.freedesktop.login1",
+                                "/org/freedesktop/login1",
+                                "org.freedesktop.login1.Manager",
+                                "GetSession",
+                                &error, &reply,
+                                "s", argv[i]);
+                if (r < 0) {
+                        log_error("Failed to get session: %s", bus_error_message(&error, r));
+                        return r;
+                }
 
-                dbus_message_iter_get_basic(iter, &u);
+                r = sd_bus_message_read(reply, "o", &path);
+                if (r < 0)
+                        return bus_log_parse_error(r);
 
-                if (streq(name, "Timestamp"))
-                        i->timestamp = (usec_t) u;
+                if (properties)
+                        r = show_properties(bus, path, &new_line);
+                else
+                        r = print_session_status_info(bus, path, &new_line);
 
-                break;
+                if (r < 0)
+                        return r;
         }
 
-        case DBUS_TYPE_STRUCT: {
-                DBusMessageIter sub;
-
-                dbus_message_iter_recurse(iter, &sub);
+        return 0;
+}
 
-                if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_UINT32 && streq(name, "User")) {
-                        uint32_t u;
+static int show_user(int argc, char *argv[], void *userdata) {
+        bool properties, new_line = false;
+        sd_bus *bus = userdata;
+        int r, i;
 
-                        dbus_message_iter_get_basic(&sub, &u);
-                        i->uid = (uid_t) u;
+        assert(bus);
+        assert(argv);
 
-                } else if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && streq(name, "Seat")) {
-                        const char *s;
+        properties = !strstr(argv[0], "status");
 
-                        dbus_message_iter_get_basic(&sub, &s);
+        pager_open_if_enabled();
 
-                        if (!isempty(s))
-                                i->seat = s;
-                }
+        if (argc <= 1) {
+                /* If not argument is specified inspect the manager
+                 * itself */
+                if (properties)
+                        return show_properties(bus, "/org/freedesktop/login1", &new_line);
 
-                break;
-        }
+                return print_user_status_info(bus, "/org/freedesktop/login1/user/self", &new_line);
         }
 
-        return 0;
-}
+        for (i = 1; i < argc; i++) {
+                _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+                _cleanup_bus_message_unref_ sd_bus_message * reply = NULL;
+                const char *path = NULL;
+                uid_t uid;
 
-static int status_property_user(const char *name, DBusMessageIter *iter, UserStatusInfo *i) {
-        assert(name);
-        assert(iter);
-        assert(i);
+                r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to look up user %s: %m", argv[i]);
 
-        switch (dbus_message_iter_get_arg_type(iter)) {
+                r = sd_bus_call_method(
+                                bus,
+                                "org.freedesktop.login1",
+                                "/org/freedesktop/login1",
+                                "org.freedesktop.login1.Manager",
+                                "GetUser",
+                                &error, &reply,
+                                "u", (uint32_t) uid);
+                if (r < 0) {
+                        log_error("Failed to get user: %s", bus_error_message(&error, r));
+                        return r;
+                }
 
-        case DBUS_TYPE_STRING: {
-                const char *s;
+                r = sd_bus_message_read(reply, "o", &path);
+                if (r < 0)
+                        return bus_log_parse_error(r);
 
-                dbus_message_iter_get_basic(iter, &s);
+                if (properties)
+                        r = show_properties(bus, path, &new_line);
+                else
+                        r = print_user_status_info(bus, path, &new_line);
 
-                if (!isempty(s)) {
-                        if (streq(name, "Name"))
-                                i->name = s;
-                        else if (streq(name, "ControlGroupPath"))
-                                i->control_group = s;
-                        else if (streq(name, "State"))
-                                i->state = s;
-                }
-                break;
+                if (r < 0)
+                        return r;
         }
 
-        case DBUS_TYPE_UINT32: {
-                uint32_t u;
-
-                dbus_message_iter_get_basic(iter, &u);
+        return 0;
+}
 
-                if (streq(name, "UID"))
-                        i->uid = (uid_t) u;
+static int show_seat(int argc, char *argv[], void *userdata) {
+        bool properties, new_line = false;
+        sd_bus *bus = userdata;
+        int r, i;
 
-                break;
-        }
+        assert(bus);
+        assert(argv);
 
-        case DBUS_TYPE_UINT64: {
-                uint64_t u;
+        properties = !strstr(argv[0], "status");
 
-                dbus_message_iter_get_basic(iter, &u);
+        pager_open_if_enabled();
 
-                if (streq(name, "Timestamp"))
-                        i->timestamp = (usec_t) u;
+        if (argc <= 1) {
+                /* If not argument is specified inspect the manager
+                 * itself */
+                if (properties)
+                        return show_properties(bus, "/org/freedesktop/login1", &new_line);
 
-                break;
+                return print_seat_status_info(bus, "/org/freedesktop/login1/seat/self", &new_line);
         }
 
-        case DBUS_TYPE_STRUCT: {
-                DBusMessageIter sub;
+        for (i = 1; i < argc; i++) {
+                _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+                _cleanup_bus_message_unref_ sd_bus_message * reply = NULL;
+                const char *path = NULL;
 
-                dbus_message_iter_recurse(iter, &sub);
+                r = sd_bus_call_method(
+                                bus,
+                                "org.freedesktop.login1",
+                                "/org/freedesktop/login1",
+                                "org.freedesktop.login1.Manager",
+                                "GetSeat",
+                                &error, &reply,
+                                "s", argv[i]);
+                if (r < 0) {
+                        log_error("Failed to get seat: %s", bus_error_message(&error, r));
+                        return r;
+                }
 
-                if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && streq(name, "Display")) {
-                        const char *s;
+                r = sd_bus_message_read(reply, "o", &path);
+                if (r < 0)
+                        return bus_log_parse_error(r);
 
-                        dbus_message_iter_get_basic(&sub, &s);
-
-                        if (!isempty(s))
-                                i->display = s;
-                }
+                if (properties)
+                        r = show_properties(bus, path, &new_line);
+                else
+                        r = print_seat_status_info(bus, path, &new_line);
 
-                break;
+                if (r < 0)
+                        return r;
         }
 
-        case DBUS_TYPE_ARRAY: {
+        return 0;
+}
 
-                if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRUCT && streq(name, "Sessions")) {
-                        DBusMessageIter sub, sub2;
+static int activate(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        char *short_argv[3];
+        int r, i;
 
-                        dbus_message_iter_recurse(iter, &sub);
-                        while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) {
-                                const char *id;
-                                const char *path;
+        assert(bus);
+        assert(argv);
 
-                                dbus_message_iter_recurse(&sub, &sub2);
+        polkit_agent_open_if_enabled();
 
-                                if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &id, true) >= 0 &&
-                                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &path, false) >= 0) {
-                                        char **l;
+        if (argc < 2) {
+                /* No argument? Let's convert this into the empty
+                 * session name, which the calls will then resolve to
+                 * the caller's session. */
 
-                                        l = strv_append(i->sessions, id);
-                                        if (!l)
-                                                return -ENOMEM;
+                short_argv[0] = argv[0];
+                short_argv[1] = (char*) "";
+                short_argv[2] = NULL;
 
-                                        strv_free(i->sessions);
-                                        i->sessions = l;
-                                }
+                argv = short_argv;
+                argc = 2;
+        }
 
-                                dbus_message_iter_next(&sub);
-                        }
+        for (i = 1; i < argc; i++) {
 
-                        return 0;
+                r = sd_bus_call_method(
+                                bus,
+                                "org.freedesktop.login1",
+                                "/org/freedesktop/login1",
+                                "org.freedesktop.login1.Manager",
+                                streq(argv[0], "lock-session")      ? "LockSession" :
+                                streq(argv[0], "unlock-session")    ? "UnlockSession" :
+                                streq(argv[0], "terminate-session") ? "TerminateSession" :
+                                                                      "ActivateSession",
+                                &error, NULL,
+                                "s", argv[i]);
+                if (r < 0) {
+                        log_error("Failed to issue method call: %s", bus_error_message(&error, -r));
+                        return r;
                 }
         }
-        }
 
         return 0;
 }
 
-static int status_property_seat(const char *name, DBusMessageIter *iter, SeatStatusInfo *i) {
-        assert(name);
-        assert(iter);
-        assert(i);
-
-        switch (dbus_message_iter_get_arg_type(iter)) {
-
-        case DBUS_TYPE_STRING: {
-                const char *s;
-
-                dbus_message_iter_get_basic(iter, &s);
-
-                if (!isempty(s)) {
-                        if (streq(name, "Id"))
-                                i->id = s;
-                }
-                break;
-        }
+static int kill_session(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        int r, i;
 
-        case DBUS_TYPE_STRUCT: {
-                DBusMessageIter sub;
+        assert(bus);
+        assert(argv);
 
-                dbus_message_iter_recurse(iter, &sub);
+        polkit_agent_open_if_enabled();
 
-                if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && streq(name, "ActiveSession")) {
-                        const char *s;
+        if (!arg_kill_who)
+                arg_kill_who = "all";
 
-                        dbus_message_iter_get_basic(&sub, &s);
+        for (i = 1; i < argc; i++) {
 
-                        if (!isempty(s))
-                                i->active_session = s;
+                r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "KillSession",
+                        &error, NULL,
+                        "ssi", argv[i], arg_kill_who, arg_signal);
+                if (r < 0) {
+                        log_error("Could not kill session: %s", bus_error_message(&error, -r));
+                        return r;
                 }
-
-                break;
         }
 
-        case DBUS_TYPE_ARRAY: {
+        return 0;
+}
 
-                if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRUCT && streq(name, "Sessions")) {
-                        DBusMessageIter sub, sub2;
+static int enable_linger(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        char* short_argv[3];
+        bool b;
+        int r, i;
 
-                        dbus_message_iter_recurse(iter, &sub);
-                        while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) {
-                                const char *id;
-                                const char *path;
+        assert(bus);
+        assert(argv);
 
-                                dbus_message_iter_recurse(&sub, &sub2);
+        polkit_agent_open_if_enabled();
 
-                                if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &id, true) >= 0 &&
-                                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &path, false) >= 0) {
-                                        char **l;
+        b = streq(argv[0], "enable-linger");
 
-                                        l = strv_append(i->sessions, id);
-                                        if (!l)
-                                                return -ENOMEM;
+        if (argc < 2) {
+                short_argv[0] = argv[0];
+                short_argv[1] = (char*) "";
+                short_argv[2] = NULL;
+                argv = short_argv;
+                argc = 2;
+        }
 
-                                        strv_free(i->sessions);
-                                        i->sessions = l;
-                                }
+        for (i = 1; i < argc; i++) {
+                uid_t uid;
 
-                                dbus_message_iter_next(&sub);
-                        }
+                if (isempty(argv[i]))
+                        uid = UID_INVALID;
+                else {
+                        r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL);
+                        if (r < 0)
+                                return log_error_errno(r, "Failed to look up user %s: %m", argv[i]);
+                }
 
-                        return 0;
+                r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "SetUserLinger",
+                        &error, NULL,
+                        "ubb", (uint32_t) uid, b, true);
+                if (r < 0) {
+                        log_error("Could not enable linger: %s", bus_error_message(&error, -r));
+                        return r;
                 }
         }
-        }
 
         return 0;
 }
 
-static int print_property(const char *name, DBusMessageIter *iter) {
-        assert(name);
-        assert(iter);
-
-        if (arg_property && !strv_find(arg_property, name))
-                return 0;
-
-        switch (dbus_message_iter_get_arg_type(iter)) {
+static int terminate_user(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        int r, i;
 
-        case DBUS_TYPE_STRUCT: {
-                DBusMessageIter sub;
+        assert(bus);
+        assert(argv);
 
-                dbus_message_iter_recurse(iter, &sub);
+        polkit_agent_open_if_enabled();
 
-                if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING &&
-                    (streq(name, "Display") || streq(name, "ActiveSession"))) {
-                        const char *s;
+        for (i = 1; i < argc; i++) {
+                uid_t uid;
 
-                        dbus_message_iter_get_basic(&sub, &s);
+                r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to look up user %s: %m", argv[i]);
 
-                        if (arg_all || !isempty(s))
-                                printf("%s=%s\n", name, s);
-                        return 0;
+                r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "TerminateUser",
+                        &error, NULL,
+                        "u", (uint32_t) uid);
+                if (r < 0) {
+                        log_error("Could not terminate user: %s", bus_error_message(&error, -r));
+                        return r;
                 }
-                break;
         }
 
-        case DBUS_TYPE_ARRAY:
+        return 0;
+}
 
-                if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRUCT && streq(name, "Sessions")) {
-                        DBusMessageIter sub, sub2;
-                        bool found = false;
+static int kill_user(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        int r, i;
 
-                        dbus_message_iter_recurse(iter, &sub);
-                        while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) {
-                                const char *id;
-                                const char *path;
+        assert(bus);
+        assert(argv);
 
-                                dbus_message_iter_recurse(&sub, &sub2);
+        polkit_agent_open_if_enabled();
 
-                                if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &id, true) >= 0 &&
-                                    bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_OBJECT_PATH, &path, false) >= 0) {
-                                        if (found)
-                                                printf(" %s", id);
-                                        else {
-                                                printf("%s=%s", name, id);
-                                                found = true;
-                                        }
-                                }
+        if (!arg_kill_who)
+                arg_kill_who = "all";
 
-                                dbus_message_iter_next(&sub);
-                        }
+        for (i = 1; i < argc; i++) {
+                uid_t uid;
 
-                        if (!found && arg_all)
-                                printf("%s=\n", name);
-                        else if (found)
-                                printf("\n");
+                r = get_user_creds((const char**) (argv+i), &uid, NULL, NULL, NULL);
+                if (r < 0)
+                        return log_error_errno(r, "Failed to look up user %s: %m", argv[i]);
 
-                        return 0;
+                r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "KillUser",
+                        &error, NULL,
+                        "ui", (uint32_t) uid, arg_signal);
+                if (r < 0) {
+                        log_error("Could not kill user: %s", bus_error_message(&error, -r));
+                        return r;
                 }
-
-                break;
         }
 
-        if (generic_print_property(name, iter, arg_all) > 0)
-                return 0;
-
-        if (arg_all)
-                printf("%s=[unprintable]\n", name);
-
         return 0;
 }
 
-static int show_one(const char *verb, DBusConnection *bus, const char *path, bool show_properties, bool *new_line) {
-        DBusMessage *m = NULL, *reply = NULL;
-        const char *interface = "";
-        int r;
-        DBusError error;
-        DBusMessageIter iter, sub, sub2, sub3;
-        SessionStatusInfo session_info;
-        UserStatusInfo user_info;
-        SeatStatusInfo seat_info;
+static int attach(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        int r, i;
 
         assert(bus);
-        assert(path);
-        assert(new_line);
+        assert(argv);
 
-        zero(session_info);
-        zero(user_info);
-        zero(seat_info);
+        polkit_agent_open_if_enabled();
 
-        dbus_error_init(&error);
+        for (i = 2; i < argc; i++) {
 
-        m = dbus_message_new_method_call(
+                r = sd_bus_call_method(
+                        bus,
                         "org.freedesktop.login1",
-                        path,
-                        "org.freedesktop.DBus.Properties",
-                        "GetAll");
-        if (!m) {
-                log_error("Could not allocate message.");
-                r = -ENOMEM;
-                goto finish;
-        }
-
-        if (!dbus_message_append_args(m,
-                                      DBUS_TYPE_STRING, &interface,
-                                      DBUS_TYPE_INVALID)) {
-                log_error("Could not append arguments to message.");
-                r = -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));
-                r = -EIO;
-                goto finish;
-        }
-
-        if (!dbus_message_iter_init(reply, &iter) ||
-            dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY ||
-            dbus_message_iter_get_element_type(&iter) != DBUS_TYPE_DICT_ENTRY)  {
-                log_error("Failed to parse reply.");
-                r = -EIO;
-                goto finish;
-        }
-
-        dbus_message_iter_recurse(&iter, &sub);
-
-        if (*new_line)
-                printf("\n");
-
-        *new_line = true;
-
-        while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
-                const char *name;
-
-                if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_DICT_ENTRY) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_iter_recurse(&sub, &sub2);
-
-                if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &name, true) < 0) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                if (dbus_message_iter_get_arg_type(&sub2) != DBUS_TYPE_VARIANT)  {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
-                }
-
-                dbus_message_iter_recurse(&sub2, &sub3);
-
-                if (show_properties)
-                        r = print_property(name, &sub3);
-                else if (strstr(verb, "session"))
-                        r = status_property_session(name, &sub3, &session_info);
-                else if (strstr(verb, "user"))
-                        r = status_property_user(name, &sub3, &user_info);
-                else
-                        r = status_property_seat(name, &sub3, &seat_info);
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "AttachDevice",
+                        &error, NULL,
+                        "ssb", argv[1], argv[i], true);
 
                 if (r < 0) {
-                        log_error("Failed to parse reply.");
-                        r = -EIO;
-                        goto finish;
+                        log_error("Could not attach device: %s", bus_error_message(&error, -r));
+                        return r;
                 }
-
-                dbus_message_iter_next(&sub);
-        }
-
-        if (!show_properties) {
-                if (strstr(verb, "session"))
-                        print_session_status_info(&session_info);
-                else if (strstr(verb, "user"))
-                        print_user_status_info(&user_info);
-                else
-                        print_seat_status_info(&seat_info);
         }
 
-        strv_free(seat_info.sessions);
-        strv_free(user_info.sessions);
+        return 0;
+}
 
-        r = 0;
+static int flush_devices(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        int r;
 
-finish:
-        if (m)
-                dbus_message_unref(m);
+        assert(bus);
+        assert(argv);
 
-        if (reply)
-                dbus_message_unref(reply);
+        polkit_agent_open_if_enabled();
 
-        dbus_error_free(&error);
+        r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "FlushDevices",
+                        &error, NULL,
+                        "b", true);
+        if (r < 0)
+                log_error("Could not flush devices: %s", bus_error_message(&error, -r));
 
         return r;
 }
 
-static int show(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL, *reply = NULL;
-        int r, ret = 0;
-        DBusError error;
-        unsigned i;
-        bool show_properties, new_line = false;
+static int lock_sessions(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        int r;
 
         assert(bus);
-        assert(args);
-
-        dbus_error_init(&error);
-
-        show_properties = !strstr(args[0], "status");
-
-        if (show_properties)
-                pager_open_if_enabled();
-
-        if (show_properties && n <= 1) {
-                /* If not argument is specified inspect the manager
-                 * itself */
-
-                ret = show_one(args[0], bus, "/org/freedesktop/login1", show_properties, &new_line);
-                goto finish;
-        }
-
-        for (i = 1; i < n; i++) {
-                const char *path = NULL;
-
-                if (strstr(args[0], "session")) {
-
-                        m = dbus_message_new_method_call(
-                                        "org.freedesktop.login1",
-                                        "/org/freedesktop/login1",
-                                        "org.freedesktop.login1.Manager",
-                                        "GetSession");
-                        if (!m) {
-                                log_error("Could not allocate message.");
-                                ret = -ENOMEM;
-                                goto finish;
-                        }
-
-                        if (!dbus_message_append_args(m,
-                                                      DBUS_TYPE_STRING, &args[i],
-                                                      DBUS_TYPE_INVALID)) {
-                                log_error("Could not append arguments to message.");
-                                ret = -ENOMEM;
-                                goto finish;
-                        }
-
-                } else if (strstr(args[0], "user")) {
-                        uid_t uid;
-                        uint32_t u;
-
-                        ret = get_user_creds((const char**) (args+i), &uid, NULL, NULL);
-                        if (ret < 0) {
-                                log_error("User %s unknown.", args[i]);
-                                goto finish;
-                        }
-
-                        m = dbus_message_new_method_call(
-                                        "org.freedesktop.login1",
-                                        "/org/freedesktop/login1",
-                                        "org.freedesktop.login1.Manager",
-                                        "GetUser");
-                        if (!m) {
-                                log_error("Could not allocate message.");
-                                ret = -ENOMEM;
-                                goto finish;
-                        }
-
-                        u = (uint32_t) uid;
-                        if (!dbus_message_append_args(m,
-                                                      DBUS_TYPE_UINT32, &u,
-                                                      DBUS_TYPE_INVALID)) {
-                                log_error("Could not append arguments to message.");
-                                ret = -ENOMEM;
-                                goto finish;
-                        }
-                } else {
-
-                        m = dbus_message_new_method_call(
-                                        "org.freedesktop.login1",
-                                        "/org/freedesktop/login1",
-                                        "org.freedesktop.login1.Manager",
-                                        "GetSeat");
-                        if (!m) {
-                                log_error("Could not allocate message.");
-                                ret = -ENOMEM;
-                                goto finish;
-                        }
-
-                        if (!dbus_message_append_args(m,
-                                                      DBUS_TYPE_STRING, &args[i],
-                                                      DBUS_TYPE_INVALID)) {
-                                log_error("Could not append arguments to 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;
-                }
-
-                if (!dbus_message_get_args(reply, &error,
-                                           DBUS_TYPE_OBJECT_PATH, &path,
-                                           DBUS_TYPE_INVALID)) {
-                        log_error("Failed to parse reply: %s", bus_error_message(&error));
-                        ret = -EIO;
-                        goto finish;
-                }
-
-                r = show_one(args[0], bus, path, show_properties, &new_line);
-                if (r != 0)
-                        ret = r;
-
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
-        }
-
-finish:
-        if (m)
-                dbus_message_unref(m);
+        assert(argv);
 
-        if (reply)
-                dbus_message_unref(reply);
+        polkit_agent_open_if_enabled();
 
-        dbus_error_free(&error);
+        r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        streq(argv[0], "lock-sessions") ? "LockSessions" : "UnlockSessions",
+                        &error, NULL,
+                        NULL);
+        if (r < 0)
+                log_error("Could not lock sessions: %s", bus_error_message(&error, -r));
 
-        return ret;
+        return r;
 }
 
-static int activate(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL;
-        int ret = 0;
-        DBusError error;
-        unsigned i;
+static int terminate_seat(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        sd_bus *bus = userdata;
+        int r, i;
 
         assert(bus);
-        assert(args);
-
-        dbus_error_init(&error);
-
-        for (i = 1; i < n; i++) {
-                DBusMessage *reply;
+        assert(argv);
 
-                m = dbus_message_new_method_call(
-                                "org.freedesktop.login1",
-                                "/org/freedesktop/login1",
-                                "org.freedesktop.login1.Manager",
-                                streq(args[0], "lock-session")      ? "LockSession" :
-                                streq(args[0], "unlock-session")    ? "UnlockSession" :
-                                streq(args[0], "terminate-session") ? "TerminateSession" :
-                                                                      "ActivateSession");
-                if (!m) {
-                        log_error("Could not allocate message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
+        polkit_agent_open_if_enabled();
 
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, &args[i],
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
+        for (i = 1; i < argc; i++) {
 
-                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;
+                r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "TerminateSeat",
+                        &error, NULL,
+                        "s", argv[i]);
+                if (r < 0) {
+                        log_error("Could not terminate seat: %s", bus_error_message(&error, -r));
+                        return r;
                 }
-
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
         }
 
-finish:
-        if (m)
-                dbus_message_unref(m);
-
-        dbus_error_free(&error);
-
-        return ret;
+        return 0;
 }
 
-static int kill_session(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL;
-        int ret = 0;
-        DBusError error;
-        unsigned i;
+static int check_inhibitors(sd_bus *bus, const char *verb, const char *inhibit_what) {
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        _cleanup_strv_free_ char **sessions = NULL;
+        const char *what, *who, *why, *mode;
+        uint32_t uid, pid;
+        unsigned c = 0;
+        char **s;
+        int r;
 
         assert(bus);
-        assert(args);
 
-        dbus_error_init(&error);
-
-        if (!arg_kill_who)
-                arg_kill_who = "all";
-
-        for (i = 1; i < n; i++) {
-                DBusMessage *reply;
+        if (geteuid() == 0)
+                return 0;
 
-                m = dbus_message_new_method_call(
-                                "org.freedesktop.login1",
-                                "/org/freedesktop/login1",
-                                "org.freedesktop.login1.Manager",
-                                "KillSession");
-                if (!m) {
-                        log_error("Could not allocate message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
+        if (!on_tty())
+                return 0;
 
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, &args[i],
-                                              DBUS_TYPE_STRING, &arg_kill_who,
-                                              DBUS_TYPE_INT32, arg_signal,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
+        r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "ListInhibitors",
+                        NULL,
+                        &reply,
+                        NULL);
+        if (r < 0)
+                /* If logind is not around, then there are no inhibitors... */
+                return 0;
 
-                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;
-                }
+        r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssuu)");
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
-        }
+        while ((r = sd_bus_message_read(reply, "(ssssuu)", &what, &who, &why, &mode, &uid, &pid)) > 0) {
+                _cleanup_free_ char *comm = NULL, *user = NULL;
+                _cleanup_strv_free_ char **sv = NULL;
 
-finish:
-        if (m)
-                dbus_message_unref(m);
+                if (!streq(mode, "block"))
+                        continue;
 
-        dbus_error_free(&error);
+                sv = strv_split(what, ":");
+                if (!sv)
+                        return log_oom();
 
-        return ret;
-}
+                if (!strv_contains(sv, inhibit_what))
+                        continue;
 
-static int enable_linger(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL;
-        int ret = 0;
-        DBusError error;
-        unsigned i;
-        dbus_bool_t b, interactive = true;
+                get_process_comm(pid, &comm);
+                user = uid_to_name(uid);
 
-        assert(bus);
-        assert(args);
+                log_warning("Operation inhibited by \"%s\" (PID "PID_FMT" \"%s\", user %s), reason is \"%s\".",
+                            who, pid, strna(comm), strna(user), why);
 
-        dbus_error_init(&error);
+                c++;
+        }
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-        b = streq(args[0], "enable-linger");
+        r = sd_bus_message_exit_container(reply);
+        if (r < 0)
+                return bus_log_parse_error(r);
 
-        for (i = 1; i < n; i++) {
-                DBusMessage *reply;
-                uint32_t u;
-                uid_t uid;
+        /* Check for current sessions */
+        sd_get_sessions(&sessions);
+        STRV_FOREACH(s, sessions) {
+                _cleanup_free_ char *type = NULL, *tty = NULL, *seat = NULL, *user = NULL, *service = NULL, *class = NULL;
 
-                m = dbus_message_new_method_call(
-                                "org.freedesktop.login1",
-                                "/org/freedesktop/login1",
-                                "org.freedesktop.login1.Manager",
-                                "SetUserLinger");
-                if (!m) {
-                        log_error("Could not allocate message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
+                if (sd_session_get_uid(*s, &uid) < 0 || uid == getuid())
+                        continue;
 
-                ret = get_user_creds((const char**) (args+i), &uid, NULL, NULL);
-                if (ret < 0) {
-                        log_error("Failed to resolve user %s: %s", args[i], strerror(-ret));
-                        goto finish;
-                }
+                if (sd_session_get_class(*s, &class) < 0 || !streq(class, "user"))
+                        continue;
 
-                u = (uint32_t) uid;
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_UINT32, &u,
-                                              DBUS_TYPE_BOOLEAN, &b,
-                                              DBUS_TYPE_BOOLEAN, &interactive,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
+                if (sd_session_get_type(*s, &type) < 0 || (!streq(type, "x11") && !streq(type, "tty")))
+                        continue;
 
-                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;
-                }
+                sd_session_get_tty(*s, &tty);
+                sd_session_get_seat(*s, &seat);
+                sd_session_get_service(*s, &service);
+                user = uid_to_name(uid);
 
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
+                log_warning("User %s is logged in on %s.", strna(user), isempty(tty) ? (isempty(seat) ? strna(service) : seat) : tty);
+                c++;
         }
 
-        ret = 0;
-
-finish:
-        if (m)
-                dbus_message_unref(m);
+        if (c <= 0)
+                return 0;
 
-        dbus_error_free(&error);
+        log_error("Please retry operation after closing inhibitors and logging out other users.\nAlternatively, ignore inhibitors and users with 'loginctl %s -i'.", verb);
 
-        return ret;
+        return -EPERM;
 }
 
-static int terminate_user(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL;
-        int ret = 0;
-        DBusError error;
-        unsigned i;
+static int poweroff(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        sd_bus *bus = userdata;
+        int r;
 
         assert(bus);
-        assert(args);
-
-        dbus_error_init(&error);
-
-        for (i = 1; i < n; i++) {
-                uint32_t u;
-                uid_t uid;
-                DBusMessage *reply;
-
-                m = dbus_message_new_method_call(
-                                "org.freedesktop.login1",
-                                "/org/freedesktop/login1",
-                                "org.freedesktop.login1.Manager",
-                                "TerminateUser");
-                if (!m) {
-                        log_error("Could not allocate message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
-
-                ret = get_user_creds((const char**) (args+i), &uid, NULL, NULL);
-                if (ret < 0) {
-                        log_error("Failed to look up user %s: %s", args[i], strerror(-ret));
-                        goto finish;
-                }
-
-                u = (uint32_t) uid;
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_UINT32, &u,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to 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;
-                }
 
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
-        }
-
-        ret = 0;
+        r = check_inhibitors(bus, "poweroff", "shutdown");
+        if (r < 0)
+                return r;
 
-finish:
-        if (m)
-                dbus_message_unref(m);
+        polkit_agent_open_if_enabled();
 
-        dbus_error_free(&error);
+        r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "PowerOff",
+                        &error,
+                        NULL,
+                        "b", arg_ask_password);
+        if (r < 0)
+                log_error("Failed to power off: %s", bus_error_message(&error, r));
 
-        return ret;
+        return r;
 }
 
-static int kill_user(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL;
-        int ret = 0;
-        DBusError error;
-        unsigned i;
+static int reboot(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        sd_bus *bus = userdata;
+        int r;
 
         assert(bus);
-        assert(args);
-
-        dbus_error_init(&error);
-
-        if (!arg_kill_who)
-                arg_kill_who = "all";
-
-        for (i = 1; i < n; i++) {
-                DBusMessage *reply;
-                uid_t uid;
-                uint32_t u;
-
-                m = dbus_message_new_method_call(
-                                "org.freedesktop.login1",
-                                "/org/freedesktop/login1",
-                                "org.freedesktop.login1.Manager",
-                                "KillUser");
-                if (!m) {
-                        log_error("Could not allocate message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
 
-                ret = get_user_creds((const char**) (args+i), &uid, NULL, NULL);
-                if (ret < 0) {
-                        log_error("Failed to look up user %s: %s", args[i], strerror(-ret));
-                        goto finish;
-                }
-
-                u = (uint32_t) uid;
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_UINT32, &u,
-                                              DBUS_TYPE_INT32, arg_signal,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to 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;
-                }
-
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
-        }
-
-        ret = 0;
+        r = check_inhibitors(bus, "reboot", "shutdown");
+        if (r < 0)
+                return r;
 
-finish:
-        if (m)
-                dbus_message_unref(m);
+        polkit_agent_open_if_enabled();
 
-        dbus_error_free(&error);
+        r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "Reboot",
+                        &error,
+                        NULL,
+                        "b", arg_ask_password);
+        if (r < 0)
+                log_error("Failed to reboot: %s", bus_error_message(&error, r));
 
-        return ret;
+        return r;
 }
 
-static int attach(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL;
-        int ret = 0;
-        DBusError error;
-        unsigned i;
-        dbus_bool_t interactive = true;
+static int suspend(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        sd_bus *bus = userdata;
+        int r;
 
         assert(bus);
-        assert(args);
-
-        dbus_error_init(&error);
-
-        for (i = 2; i < n; i++) {
-                DBusMessage *reply;
-
-                m = dbus_message_new_method_call(
-                                "org.freedesktop.login1",
-                                "/org/freedesktop/login1",
-                                "org.freedesktop.login1.Manager",
-                                "AttachDevice");
-                if (!m) {
-                        log_error("Could not allocate message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
-
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, &args[1],
-                                              DBUS_TYPE_STRING, &args[i],
-                                              DBUS_TYPE_BOOLEAN, &interactive,
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to 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;
-                }
 
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
-        }
+        r = check_inhibitors(bus, "suspend", "sleep");
+        if (r < 0)
+                return r;
 
-finish:
-        if (m)
-                dbus_message_unref(m);
+        polkit_agent_open_if_enabled();
 
-        dbus_error_free(&error);
+        r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "Suspend",
+                        &error,
+                        NULL,
+                        "b", arg_ask_password);
+        if (r < 0)
+                log_error("Failed to suspend: %s", bus_error_message(&error, r));
 
-        return ret;
+        return r;
 }
 
-static int flush_devices(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL, *reply = NULL;
-        int ret = 0;
-        DBusError error;
-        dbus_bool_t interactive = true;
+static int hibernate(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        sd_bus *bus = userdata;
+        int r;
 
         assert(bus);
-        assert(args);
 
-        dbus_error_init(&error);
+        r = check_inhibitors(bus, "hibernate", "sleep");
+        if (r < 0)
+                return r;
+
+        polkit_agent_open_if_enabled();
 
-        m = dbus_message_new_method_call(
+        r = sd_bus_call_method(
+                        bus,
                         "org.freedesktop.login1",
                         "/org/freedesktop/login1",
                         "org.freedesktop.login1.Manager",
-                        "FlushDevices");
-        if (!m) {
-                log_error("Could not allocate message.");
-                ret = -ENOMEM;
-                goto finish;
-        }
-
-        if (!dbus_message_append_args(m,
-                                      DBUS_TYPE_BOOLEAN, &interactive,
-                                      DBUS_TYPE_INVALID)) {
-                log_error("Could not append arguments to 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);
+                        "Hibernate",
+                        &error,
+                        NULL,
+                        "b", arg_ask_password);
+        if (r < 0)
+                log_error("Failed to hibernate: %s", bus_error_message(&error, r));
 
-        return ret;
+        return r;
 }
 
-static int terminate_seat(DBusConnection *bus, char **args, unsigned n) {
-        DBusMessage *m = NULL;
-        int ret = 0;
-        DBusError error;
-        unsigned i;
+static int hybrid_sleep(int argc, char *argv[], void *userdata) {
+        _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
+        sd_bus *bus = userdata;
+        int r;
 
         assert(bus);
-        assert(args);
-
-        dbus_error_init(&error);
-
-        for (i = 1; i < n; i++) {
-                DBusMessage *reply;
-
-                m = dbus_message_new_method_call(
-                                "org.freedesktop.login1",
-                                "/org/freedesktop/login1",
-                                "org.freedesktop.login1.Manager",
-                                "TerminateSeat");
-                if (!m) {
-                        log_error("Could not allocate message.");
-                        ret = -ENOMEM;
-                        goto finish;
-                }
 
-                if (!dbus_message_append_args(m,
-                                              DBUS_TYPE_STRING, &args[i],
-                                              DBUS_TYPE_INVALID)) {
-                        log_error("Could not append arguments to 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;
-                }
-
-                dbus_message_unref(m);
-                dbus_message_unref(reply);
-                m = reply = NULL;
-        }
+        r = check_inhibitors(bus, "hybrid-sleep", "sleep");
+        if (r < 0)
+                return r;
 
-finish:
-        if (m)
-                dbus_message_unref(m);
+        polkit_agent_open_if_enabled();
 
-        dbus_error_free(&error);
+        r = sd_bus_call_method(
+                        bus,
+                        "org.freedesktop.login1",
+                        "/org/freedesktop/login1",
+                        "org.freedesktop.login1.Manager",
+                        "HybridSleep",
+                        &error,
+                        NULL,
+                        "b", arg_ask_password);
+        if (r < 0)
+                log_error("Failed to hybrid sleep: %s", bus_error_message(&error, r));
 
-        return ret;
+        return r;
 }
 
-static int help(void) {
+static int help(int argc, char *argv[], void *userdata) {
 
         printf("%s [OPTIONS...] {COMMAND} ...\n\n"
                "Send control commands to or query the login manager.\n\n"
-               "  -h --help           Show this help\n"
-               "     --version        Show package version\n"
-               "  -p --property=NAME  Show only properties by this name\n"
-               "  -a --all            Show all properties, including empty ones\n"
-               "     --kill-who=WHO   Who to send signal to\n"
-               "  -s --signal=SIGNAL  Which signal to send\n"
-               "  -H --host=[USER@]HOST\n"
-               "                      Show information for remote host\n"
-               "  -P --privileged     Acquire privileges before execution\n"
-               "     --no-pager       Do not pipe output into a pager\n\n"
-               "Commands:\n"
-               "  list-sessions                   List sessions\n"
-               "  session-status [ID...]          Show session status\n"
-               "  show-session [ID...]            Show properties of one or more sessions\n"
-               "  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"
-               "  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"
-               "  user-status [USER...]           Show user status\n"
-               "  show-user [USER...]             Show properties of one or more users\n"
-               "  enable-linger [USER...]         Enable linger state of one or more users\n"
-               "  disable-linger [USER...]        Disable linger state of one or more users\n"
-               "  terminate-user [USER...]        Terminate all sessions of one or more users\n"
-               "  kill-user [USER...]             Send signal to processes of a user\n"
-               "  list-seats                      List seats\n"
-               "  seat-status [NAME...]           Show seat status\n"
-               "  show-seat [NAME...]             Show properties of one or more seats\n"
-               "  attach [NAME] [DEVICE...]       Attach one or more devices to a seat\n"
-               "  flush-devices                   Flush all device associations\n"
-               "  terminate-seat [NAME...]        Terminate all sessions on one or more seats\n",
-               program_invocation_short_name);
+               "  -h --help                Show this help\n"
+               "     --version             Show package version\n"
+               "     --no-pager            Do not pipe output into a pager\n"
+               "     --no-legend           Do not show the headers and footers\n"
+               "     --no-ask-password     Don't prompt for password\n"
+               "  -H --host=[USER@]HOST    Operate on remote host\n"
+               "  -M --machine=CONTAINER   Operate on local container\n"
+               "  -p --property=NAME       Show only properties by this name\n"
+               "  -a --all                 Show all properties, including empty ones\n"
+               "  -l --full                Do not ellipsize output\n"
+               "     --kill-who=WHO        Who to send signal to\n"
+               "  -s --signal=SIGNAL       Which signal to send\n"
+#if 0
+               "  -n --lines=INTEGER       Number of journal entries to show\n"
+               "  -o --output=STRING       Change journal output mode (short, short-monotonic,\n"
+               "                           verbose, export, json, json-pretty, json-sse, cat)\n\n"
+#endif // 0
+               "Session Commands:\n"
+               "  list-sessions            List sessions\n"
+               "  session-status [ID...]   Show session status\n"
+               "  show-session [ID...]     Show properties of sessions or the manager\n"
+               "  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"
+               "  unlock-sessions          Screen unlock all current sessions\n"
+               "  terminate-session ID...  Terminate one or more sessions\n"
+               "  kill-session ID...       Send signal to processes of a session\n\n"
+               "User Commands:\n"
+               "  list-users               List users\n"
+               "  user-status [USER...]    Show user status\n"
+               "  show-user [USER...]      Show properties of users or the manager\n"
+               "  enable-linger [USER...]  Enable linger state of one or more users\n"
+               "  disable-linger [USER...] Disable linger state of one or more users\n"
+               "  terminate-user USER...   Terminate all sessions of one or more users\n"
+               "  kill-user USER...        Send signal to processes of a user\n\n"
+               "Seat Commands:\n"
+               "  list-seats               List seats\n"
+               "  seat-status [NAME...]    Show seat status\n"
+               "  show-seat [NAME...]      Show properties of seats or the manager\n"
+               "  attach NAME DEVICE...    Attach one or more devices to a seat\n"
+               "  flush-devices            Flush all device associations\n"
+               "  terminate-seat NAME...   Terminate all sessions on one or more seats\n"
+               "System Commands:\n"
+               "  poweroff                 Turn off the machine\n"
+               "  reboot                   Reboot the machine\n"
+               "  suspend                  Suspend the machine to memory\n"
+               "  hibernate                Suspend the machine to disk\n"
+               "  hybrid-sleep             Suspend the machine to memory and disk\n"
+               , program_invocation_short_name);
 
         return 0;
 }
@@ -1684,50 +1487,53 @@ static int parse_argv(int argc, char *argv[]) {
         enum {
                 ARG_VERSION = 0x100,
                 ARG_NO_PAGER,
-                ARG_KILL_WHO
+                ARG_NO_LEGEND,
+                ARG_KILL_WHO,
+                ARG_NO_ASK_PASSWORD,
         };
 
         static const struct option options[] = {
-                { "help",      no_argument,       NULL, 'h'           },
-                { "version",   no_argument,       NULL, ARG_VERSION   },
-                { "property",  required_argument, NULL, 'p'           },
-                { "all",       no_argument,       NULL, 'a'           },
-                { "no-pager",  no_argument,       NULL, ARG_NO_PAGER  },
-                { "kill-who",  required_argument, NULL, ARG_KILL_WHO  },
-                { "signal",    required_argument, NULL, 's'           },
-                { "host",      required_argument, NULL, 'H'           },
-                { "privileged",no_argument,       NULL, 'P'           },
-                { NULL,        0,                 NULL, 0             }
+                { "help",            no_argument,       NULL, 'h'                 },
+                { "version",         no_argument,       NULL, ARG_VERSION         },
+                { "property",        required_argument, NULL, 'p'                 },
+                { "all",             no_argument,       NULL, 'a'                 },
+                { "full",            no_argument,       NULL, 'l'                 },
+                { "no-pager",        no_argument,       NULL, ARG_NO_PAGER        },
+                { "no-legend",       no_argument,       NULL, ARG_NO_LEGEND       },
+                { "kill-who",        required_argument, NULL, ARG_KILL_WHO        },
+                { "signal",          required_argument, NULL, 's'                 },
+                { "host",            required_argument, NULL, 'H'                 },
+                { "machine",         required_argument, NULL, 'M'                 },
+                { "no-ask-password", no_argument,       NULL, ARG_NO_ASK_PASSWORD },
+#if 0
+                { "lines",           required_argument, NULL, 'n'                 },
+                { "output",          required_argument, NULL, 'o'                 },
+#endif //
+                {}
         };
 
-        int c;
+        int c, r;
 
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hp:as:H:P", options, NULL)) >= 0) {
+        while ((c = getopt_long(argc, argv, "hp:als:H:M:", options, NULL)) >= 0)
 
                 switch (c) {
 
                 case 'h':
-                        help();
+                        help(0, NULL, NULL);
                         return 0;
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
                 case 'p': {
-                        char **l;
-
-                        l = strv_append(arg_property, optarg);
-                        if (!l)
-                                return -ENOMEM;
-
-                        strv_free(arg_property);
-                        arg_property = l;
+                        r = strv_extend(&arg_property, optarg);
+                        if (r < 0)
+                                return log_oom();
 
                         /* If the user asked for a particular
                          * property, show it to him, even if it is
@@ -1740,10 +1546,37 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_all = true;
                         break;
 
+                case 'l':
+                        arg_full = true;
+                        break;
+#if 0
+                case 'n':
+                        if (safe_atou(optarg, &arg_lines) < 0) {
+                                log_error("Failed to parse lines '%s'", optarg);
+                                return -EINVAL;
+                        }
+                        break;
+
+                case 'o':
+                        arg_output = output_mode_from_string(optarg);
+                        if (arg_output < 0) {
+                                log_error("Unknown output '%s'.", optarg);
+                                return -EINVAL;
+                        }
+                        break;
+#endif // 0
                 case ARG_NO_PAGER:
                         arg_no_pager = true;
                         break;
 
+                case ARG_NO_LEGEND:
+                        arg_legend = false;
+                        break;
+
+                case ARG_NO_ASK_PASSWORD:
+                        arg_ask_password = false;
+                        break;
+
                 case ARG_KILL_WHO:
                         arg_kill_who = optarg;
                         break;
@@ -1756,12 +1589,13 @@ static int parse_argv(int argc, char *argv[]) {
                         }
                         break;
 
-                case 'P':
-                        arg_transport = TRANSPORT_POLKIT;
+                case 'H':
+                        arg_transport = BUS_TRANSPORT_REMOTE;
+                        arg_host = optarg;
                         break;
 
-                case 'H':
-                        arg_transport = TRANSPORT_SSH;
+                case 'M':
+                        arg_transport = BUS_TRANSPORT_MACHINE;
                         arg_host = optarg;
                         break;
 
@@ -1769,158 +1603,77 @@ static int parse_argv(int argc, char *argv[]) {
                         return -EINVAL;
 
                 default:
-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
+                        assert_not_reached("Unhandled option");
                 }
-        }
 
         return 1;
 }
 
-static int loginctl_main(DBusConnection *bus, int argc, char *argv[], DBusError *error) {
-
-        static const struct {
-                const char* verb;
-                const enum {
-                        MORE,
-                        LESS,
-                        EQUAL
-                } argc_cmp;
-                const int argc;
-                int (* const dispatch)(DBusConnection *bus, char **args, unsigned n);
-        } verbs[] = {
-                { "list-sessions",         LESS,   1, list_sessions    },
-                { "session-status",        MORE,   2, show             },
-                { "show-session",          MORE,   1, show             },
-                { "activate",              EQUAL,  2, activate         },
-                { "lock-session",          MORE,   2, activate         },
-                { "unlock-session",        MORE,   2, activate         },
-                { "terminate-session",     MORE,   2, activate         },
-                { "kill-session",          MORE,   2, kill_session     },
-                { "list-users",            EQUAL,  1, list_users       },
-                { "user-status",           MORE,   2, show             },
-                { "show-user",             MORE,   1, show             },
-                { "enable-linger",         MORE,   2, enable_linger    },
-                { "disable-linger",        MORE,   2, enable_linger    },
-                { "terminate-user",        MORE,   2, terminate_user   },
-                { "kill-user",             MORE,   2, kill_user        },
-                { "list-seats",            EQUAL,  1, list_seats       },
-                { "seat-status",           MORE,   2, show             },
-                { "show-seat",             MORE,   1, show             },
-                { "attach",                MORE,   3, attach           },
-                { "flush-devices",         EQUAL,  1, flush_devices    },
-                { "terminate-seat",        MORE,   2, terminate_seat   },
+static int loginctl_main(int argc, char *argv[], sd_bus *bus) {
+
+        static const Verb verbs[] = {
+                { "help",              VERB_ANY, VERB_ANY, 0,            help              },
+                { "list-sessions",     VERB_ANY, 1,        VERB_DEFAULT, list_sessions     },
+                { "session-status",    VERB_ANY, VERB_ANY, 0,            show_session      },
+                { "show-session",      VERB_ANY, VERB_ANY, 0,            show_session      },
+                { "activate",          VERB_ANY, 2,        0,            activate          },
+                { "lock-session",      VERB_ANY, VERB_ANY, 0,            activate          },
+                { "unlock-session",    VERB_ANY, VERB_ANY, 0,            activate          },
+                { "lock-sessions",     VERB_ANY, 1,        0,            lock_sessions     },
+                { "unlock-sessions",   VERB_ANY, 1,        0,            lock_sessions     },
+                { "terminate-session", 2,        VERB_ANY, 0,            activate          },
+                { "kill-session",      2,        VERB_ANY, 0,            kill_session      },
+                { "list-users",        VERB_ANY, 1,        0,            list_users        },
+                { "user-status",       VERB_ANY, VERB_ANY, 0,            show_user         },
+                { "show-user",         VERB_ANY, VERB_ANY, 0,            show_user         },
+                { "enable-linger",     VERB_ANY, VERB_ANY, 0,            enable_linger     },
+                { "disable-linger",    VERB_ANY, VERB_ANY, 0,            enable_linger     },
+                { "terminate-user",    2,        VERB_ANY, 0,            terminate_user    },
+                { "kill-user",         2,        VERB_ANY, 0,            kill_user         },
+                { "list-seats",        VERB_ANY, 1,        0,            list_seats        },
+                { "seat-status",       VERB_ANY, VERB_ANY, 0,            show_seat         },
+                { "show-seat",         VERB_ANY, VERB_ANY, 0,            show_seat         },
+                { "attach",            3,        VERB_ANY, 0,            attach            },
+                { "flush-devices",     VERB_ANY, 1,        0,            flush_devices     },
+                { "terminate-seat",    2,        VERB_ANY, 0,            terminate_seat    },
+                { "poweroff",          VERB_ANY, 1,        0,            poweroff          },
+                { "reboot",            VERB_ANY, 1,        0,            reboot            },
+                { "suspend",           VERB_ANY, 1,        0,            suspend           },
+                { "hibernate",         VERB_ANY, 1,        0,            hibernate         },
+                { "hybrid-sleep",      VERB_ANY, 1,        0,            hybrid_sleep      },
+                {}
         };
 
-        int left;
-        unsigned i;
-
-        assert(argc >= 0);
-        assert(argv);
-        assert(error);
-
-        left = argc - optind;
-
-        if (left <= 0)
-                /* Special rule: no arguments means "list-sessions" */
-                i = 0;
-        else {
-                if (streq(argv[optind], "help")) {
-                        help();
-                        return 0;
-                }
-
-                for (i = 0; i < ELEMENTSOF(verbs); i++)
-                        if (streq(argv[optind], verbs[i].verb))
-                                break;
-
-                if (i >= ELEMENTSOF(verbs)) {
-                        log_error("Unknown operation %s", argv[optind]);
-                        return -EINVAL;
-                }
-        }
-
-        switch (verbs[i].argc_cmp) {
-
-        case EQUAL:
-                if (left != verbs[i].argc) {
-                        log_error("Invalid number of arguments.");
-                        return -EINVAL;
-                }
-
-                break;
-
-        case MORE:
-                if (left < verbs[i].argc) {
-                        log_error("Too few arguments.");
-                        return -EINVAL;
-                }
-
-                break;
-
-        case LESS:
-                if (left > verbs[i].argc) {
-                        log_error("Too many arguments.");
-                        return -EINVAL;
-                }
-
-                break;
-
-        default:
-                assert_not_reached("Unknown comparison operator.");
-        }
-
-        if (!bus) {
-                log_error("Failed to get D-Bus connection: %s", error->message);
-                return -EIO;
-        }
-
-        return verbs[i].dispatch(bus, argv + optind, left);
+        return dispatch_verb(argc, argv, verbs, bus);
 }
 
-int main(int argc, char*argv[]) {
-        int r, retval = EXIT_FAILURE;
-        DBusConnection *bus = NULL;
-        DBusError error;
-
-        dbus_error_init(&error);
+int main(int argc, char *argv[]) {
+        _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL;
+        int r;
 
+        setlocale(LC_ALL, "");
         log_parse_environment();
         log_open();
 
         r = parse_argv(argc, argv);
-        if (r < 0)
+        if (r <= 0)
                 goto finish;
-        else if (r == 0) {
-                retval = EXIT_SUCCESS;
+
+        r = bus_open_transport(arg_transport, arg_host, false, &bus);
+        if (r < 0) {
+                log_error_errno(r, "Failed to create bus connection: %m");
                 goto finish;
         }
 
-        if (arg_transport == TRANSPORT_NORMAL)
-                bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
-        else if (arg_transport == TRANSPORT_POLKIT)
-                bus_connect_system_polkit(&bus, &error);
-        else if (arg_transport == TRANSPORT_SSH)
-                bus_connect_system_ssh(NULL, arg_host, &bus, &error);
-        else
-                assert_not_reached("Uh, invalid transport...");
+        sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
 
-        r = loginctl_main(bus, argc, argv, &error);
-        retval = r < 0 ? EXIT_FAILURE : r;
+        r = loginctl_main(argc, argv, bus);
 
 finish:
-        if (bus) {
-                dbus_connection_flush(bus);
-                dbus_connection_close(bus);
-                dbus_connection_unref(bus);
-        }
-
-        dbus_error_free(&error);
-        dbus_shutdown();
+        pager_close();
+        polkit_agent_close();
 
         strv_free(arg_property);
 
-        pager_close();
-
-        return retval;
+        return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }