X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Floginctl.c;h=f96a568610b07e78be5bb3784842ab064f875b9b;hp=30e97e352af09a2556ed34703ffa33e7bdbd2332;hb=4f8f66cb4236783cd3cbee97fefc9aaa8469ac08;hpb=55efac6cbcea0d8edda9c6820620ceb390009e7a diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 30e97e352..f96a56861 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -6,331 +6,244 @@ 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 . ***/ -#include #include #include #include #include #include +#include +#include "sd-bus.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 "cgroup-show.h" +#include "cgroup-util.h" +#include "spawn-polkit-agent.h" static char **arg_property = NULL; static bool arg_all = false; +static bool arg_full = false; static bool arg_no_pager = false; 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 bool arg_ask_password = true; +static char *arg_host = NULL; 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) { - dbus_error_init(&error); + /* Open the polkit agent as a child process if necessary */ - assert(bus); + if (!arg_ask_password) + return; + + if (arg_transport != BUS_TRANSPORT_LOCAL) + return; + + polkit_agent_open(); +} + +static int list_sessions(sd_bus *bus, char **args, unsigned n) { + _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; + unsigned k = 0; + uint32_t uid; + int r; 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); - - if (on_tty()) - 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); + r = sd_bus_message_enter_container(reply, 'a', "(susso)"); + if (r < 0) + return bus_log_parse_error(r); - 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; - } + printf("%10s %10s %-16s %-16s\n", "SESSION", "UID", "USER", "SEAT"); + 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()) - 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); + printf("\n%u sessions listed.\n", k); - 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(sd_bus *bus, char **args, unsigned n) { + _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; unsigned k = 0; - - dbus_error_init(&error); - - assert(bus); + uint32_t uid; + int r; 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; - } - - 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; + "ListUsers", + &error, &reply, + ""); + if (r < 0) { + log_error("Failed to list users: %s", bus_error_message(&error, r)); + return r; } - dbus_message_iter_recurse(&iter, &sub); - - if (on_tty()) - 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; - } + r = sd_bus_message_enter_container(reply, 'a', "(uso)"); + if (r < 0) + return bus_log_parse_error(r); - 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; - } + printf("%10s %-16s\n", "UID", "USER"); + 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()) - 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); + printf("\n%u users listed.\n", k); - 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(sd_bus *bus, char **args, unsigned n) { + _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; unsigned k = 0; - - dbus_error_init(&error); - - assert(bus); + int r; 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; + "ListSeats", + &error, &reply, + ""); + if (r < 0) { + log_error("Failed to list seats: %s", bus_error_message(&error, r)); + return r; } - 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_STRUCT) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; - } + r = sd_bus_message_enter_container(reply, 'a', "(so)"); + if (r < 0) + return bus_log_parse_error(r); - dbus_message_iter_recurse(&iter, &sub); + printf("%-16s\n", "SEAT"); - if (on_tty()) - printf("%-16s\n", "SEAT"); + 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); - while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { - const char *seat, *object; + printf("\n%u seats listed.\n", k); - if (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_STRUCT) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; - } + return 0; +} - dbus_message_iter_recurse(&sub, &sub2); +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, output_flags; + unsigned c; - 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; - } + assert(bus); + assert(unit); - printf("%-16s\n", seat); + if (arg_transport != BUS_TRANSPORT_LOCAL) + return 0; - k++; + path = unit_dbus_path_from_name(unit); + if (!path) + return -ENOMEM; - dbus_message_iter_next(&sub); - } + r = sd_bus_get_property( + bus, + "org.freedesktop.systemd1", + path, + interface, + "ControlGroup", + &error, &reply, "s"); + if (r < 0) + return r; - if (on_tty()) - printf("\n%u seats listed.\n", k); + r = sd_bus_message_read(reply, "s", &cgroup); + if (r < 0) + return r; - r = 0; + if (isempty(cgroup)) + return 0; -finish: - if (m) - dbus_message_unref(m); + if (cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, cgroup, false) != 0 && leader <= 0) + return 0; - if (reply) - dbus_message_unref(reply); + output_flags = + arg_all * OUTPUT_SHOW_ALL | + arg_full * OUTPUT_FULL_WIDTH; - dbus_error_free(&error); + c = columns(); + if (c > 18) + c -= 18; + else + c = 0; - return r; + show_cgroup_and_extra(SYSTEMD_CGROUP_CONTROLLER, cgroup, "\t\t ", c, false, &leader, leader > 0, output_flags); + return 0; } typedef struct SessionStatusInfo { @@ -338,8 +251,7 @@ typedef struct SessionStatusInfo { uid_t uid; const char *name; usec_t timestamp; - const char *control_group; - int vtnr; + unsigned int vtnr; const char *seat; const char *tty; const char *display; @@ -350,17 +262,18 @@ typedef struct SessionStatusInfo { pid_t leader; const char *type; const char *class; - bool active; + const char *state; + const char *scope; } SessionStatusInfo; typedef struct UserStatusInfo { uid_t uid; const char *name; usec_t timestamp; - const char *control_group; const char *state; char **sessions; const char *display; + const char *slice; } UserStatusInfo; typedef struct SeatStatusInfo { @@ -369,128 +282,225 @@ typedef struct SeatStatusInfo { char **sessions; } SeatStatusInfo; -static void print_session_status_info(SessionStatusInfo *i) { - char since1[FORMAT_TIMESTAMP_PRETTY_MAX], *s1; +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; + + free(*p); + *p = strdup(s); + + if (!*p) + return -ENOMEM; + } 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) { + + 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) }, + { "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) }, + { "User", "(uo)", prop_map_first_of_struct, offsetof(SessionStatusInfo, uid) }, + { "Seat", "(so)", prop_map_first_of_struct, offsetof(SessionStatusInfo, id) }, + {} + }; + + char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1; char since2[FORMAT_TIMESTAMP_MAX], *s2; - assert(i); + SessionStatusInfo i = {}; + int r; + + r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i); + if (r < 0) + return r; - 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); + s2 = format_timestamp(since2, sizeof(since2), i.timestamp); 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 (i.seat) { + printf("\t Seat: %s", i.seat); - if (i->vtnr > 0) - printf("; vc%i", i->vtnr); + if (i.vtnr > 0) + printf("; vc%i", 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); - - if (i->class) - printf("; class %s", i->class); - } else if (i->class) - printf("\t Class: %s\n", i->class); - - - printf("\t Active: %s\n", yes_no(i->active)); + } else if (i.type) { + printf("\t Type: %s\n", i.type); - if (i->control_group) { - unsigned c; - - printf("\t CGroup: %s\n", i->control_group); + if (i.class) + printf("; class %s", i.class); + } else if (i.class) + printf("\t Class: %s\n", i.class); - if (arg_transport != TRANSPORT_SSH) { - c = columns(); - if (c > 18) - c -= 18; - else - c = 0; + if (i.state) + printf("\t State: %s\n", i.state); - show_cgroup_by_path(i->control_group, "\t\t ", c, false); - } + if (i.scope) { + printf("\t Unit: %s\n", i.scope); + show_unit_cgroup(bus, "org.freedesktop.systemd1.Scope", i.scope, i.leader); } + + return 0; } -static void print_user_status_info(UserStatusInfo *i) { - char since1[FORMAT_TIMESTAMP_PRETTY_MAX], *s1; +static int print_user_status_info(sd_bus *bus, const char *path) { + + 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) }, + { "Display", "(so)", prop_map_first_of_struct, offsetof(UserStatusInfo, display) }, + { "Sessions", "a(so)", prop_map_sessions_strv, offsetof(UserStatusInfo, sessions) }, + {} + }; + + char since1[FORMAT_TIMESTAMP_RELATIVE_MAX], *s1; char since2[FORMAT_TIMESTAMP_MAX], *s2; - assert(i); + UserStatusInfo i = {}; + int r; + + r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i); + if (r < 0) + goto finish; - 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); + s2 = format_timestamp(since2, sizeof(since2), i.timestamp); 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 +509,41 @@ static void print_user_status_info(UserStatusInfo *i) { printf("\n"); } - if (i->control_group) { - unsigned c; - - printf("\t CGroup: %s\n", i->control_group); + if (i.slice) { + printf("\t Unit: %s\n", i.slice); + show_unit_cgroup(bus, "org.freedesktop.systemd1.Slice", i.slice, 0); + } - if (arg_transport != TRANSPORT_SSH) { - c = columns(); - if (c > 18) - c -= 18; - else - c = 0; +finish: + strv_free(i.sessions); - show_cgroup_by_path(i->control_group, "\t\t ", c, false); - } - } + return 0; } -static void print_seat_status_info(SeatStatusInfo *i) { - assert(i); +static int print_seat_status_info(sd_bus *bus, const char *path) { - printf("%s\n", strna(i->id)); + 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) }, + {} + }; + + SeatStatusInfo i = {}; + int r; + + r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i); + if (r < 0) + goto finish; + + 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 +552,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,1134 +563,503 @@ static void print_seat_status_info(SeatStatusInfo *i) { printf("\t Devices:\n"); - 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); - - 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; - 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; - } - - case DBUS_TYPE_UINT32: { - uint32_t u; - - dbus_message_iter_get_basic(iter, &u); - - if (streq(name, "VTNr")) - i->vtnr = (int) u; - else if (streq(name, "Leader")) - i->leader = (pid_t) u; - - break; - } - - case DBUS_TYPE_BOOLEAN: { - dbus_bool_t b; - - dbus_message_iter_get_basic(iter, &b); - - if (streq(name, "Remote")) - i->remote = b; - else if (streq(name, "Active")) - i->active = b; - - break; - } - - case DBUS_TYPE_UINT64: { - uint64_t u; - - dbus_message_iter_get_basic(iter, &u); - - if (streq(name, "Timestamp")) - i->timestamp = (usec_t) u; - - break; - } - - case DBUS_TYPE_STRUCT: { - DBusMessageIter sub; - - dbus_message_iter_recurse(iter, &sub); - - if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_UINT32 && streq(name, "User")) { - uint32_t u; - - dbus_message_iter_get_basic(&sub, &u); - i->uid = (uid_t) u; - - } else if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && streq(name, "Seat")) { - const char *s; - - dbus_message_iter_get_basic(&sub, &s); - - if (!isempty(s)) - i->seat = s; - } - - break; - } - } - - return 0; -} - -static int status_property_user(const char *name, DBusMessageIter *iter, UserStatusInfo *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, "Name")) - i->name = s; - else if (streq(name, "ControlGroupPath")) - i->control_group = s; - else if (streq(name, "State")) - i->state = s; - } - break; - } - - case DBUS_TYPE_UINT32: { - uint32_t u; - - dbus_message_iter_get_basic(iter, &u); - - if (streq(name, "UID")) - i->uid = (uid_t) u; - - break; - } - - case DBUS_TYPE_UINT64: { - uint64_t u; - - dbus_message_iter_get_basic(iter, &u); - - if (streq(name, "Timestamp")) - i->timestamp = (usec_t) u; - - break; - } - - case DBUS_TYPE_STRUCT: { - DBusMessageIter sub; - - dbus_message_iter_recurse(iter, &sub); - - if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && streq(name, "Display")) { - const char *s; - - dbus_message_iter_get_basic(&sub, &s); - - if (!isempty(s)) - i->display = s; - } - - break; - } - - case DBUS_TYPE_ARRAY: { - - if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRUCT && streq(name, "Sessions")) { - DBusMessageIter sub, sub2; - - dbus_message_iter_recurse(iter, &sub); - while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) { - const char *id; - const char *path; - - 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_OBJECT_PATH, &path, false) >= 0) { - char **l; - - l = strv_append(i->sessions, id); - if (!l) - return -ENOMEM; - - strv_free(i->sessions); - i->sessions = l; - } - - dbus_message_iter_next(&sub); - } - - return 0; - } - } - } - - 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; - } - - case DBUS_TYPE_STRUCT: { - DBusMessageIter sub; - - dbus_message_iter_recurse(iter, &sub); - - if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && streq(name, "ActiveSession")) { - const char *s; - - dbus_message_iter_get_basic(&sub, &s); - - if (!isempty(s)) - i->active_session = s; - } - - break; + show_sysfs(i.id, "\t\t ", c); } - case DBUS_TYPE_ARRAY: { - - if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRUCT && streq(name, "Sessions")) { - DBusMessageIter sub, sub2; - - dbus_message_iter_recurse(iter, &sub); - while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) { - const char *id; - const char *path; - - 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_OBJECT_PATH, &path, false) >= 0) { - char **l; - - l = strv_append(i->sessions, id); - if (!l) - return -ENOMEM; - - strv_free(i->sessions); - i->sessions = l; - } - - dbus_message_iter_next(&sub); - } - - return 0; - } - } - } +finish: + strv_free(i.sessions); 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 show_session(sd_bus *bus, char **args, unsigned n) { + bool show_properties; + unsigned i; + int r; - case DBUS_TYPE_STRUCT: { - DBusMessageIter sub; + assert(bus); + assert(args); - dbus_message_iter_recurse(iter, &sub); + show_properties = !strstr(args[0], "status"); - if (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRING && - (streq(name, "Display") || streq(name, "ActiveSession"))) { - const char *s; + pager_open_if_enabled(); - dbus_message_iter_get_basic(&sub, &s); + if (show_properties && n <= 1) { + /* If not argument is specified inspect the manager + * itself */ + r = bus_print_all_properties(bus, "org.freedesktop.login1", "/org/freedesktop/login1", NULL, arg_all); + if (r < 0) + log_error("Failed to query login manager."); - if (arg_all || !isempty(s)) - printf("%s=%s\n", name, s); - return 0; - } - break; + return r; } - case DBUS_TYPE_ARRAY: - - if (dbus_message_iter_get_element_type(iter) == DBUS_TYPE_STRUCT && streq(name, "Sessions")) { - DBusMessageIter sub, sub2; - bool found = false; - - dbus_message_iter_recurse(iter, &sub); - while (dbus_message_iter_get_arg_type(&sub) == DBUS_TYPE_STRUCT) { - const char *id; - const char *path; - - 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_OBJECT_PATH, &path, false) >= 0) { - if (found) - printf(" %s", id); - else { - printf("%s=%s", name, id); - found = true; - } - } - - dbus_message_iter_next(&sub); - } - - if (!found && arg_all) - printf("%s=\n", name); - else if (found) - printf("\n"); + for (i = 1; i < n; 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; - return 0; - } + if (i != 1) + printf("\n"); - break; - } + r = sd_bus_call_method( + bus, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "GetSession", + &error, &reply, + "s", args[i]); + if (r < 0) { + log_error("Failed to get session: %s", bus_error_message(&error, r)); + return r; + } - if (generic_print_property(name, iter, arg_all) > 0) - return 0; + r = sd_bus_message_read(reply, "o", &path); + if (r < 0) + return bus_log_parse_error(r); - if (arg_all) - printf("%s=[unprintable]\n", name); + if (show_properties) + r = bus_print_all_properties(bus, "org.freedesktop.login1", path, NULL, arg_all); + else + r = print_session_status_info(bus, path); + if (r < 0) { + log_error("Failed to query session: %s", strerror(-r)); + return r; + } + } 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 = ""; +static int show_user(sd_bus *bus, char **args, unsigned n) { + bool show_properties; + unsigned i; int r; - DBusError error; - DBusMessageIter iter, sub, sub2, sub3; - SessionStatusInfo session_info; - UserStatusInfo user_info; - SeatStatusInfo seat_info; assert(bus); - assert(path); - assert(new_line); - - zero(session_info); - zero(user_info); - zero(seat_info); - - dbus_error_init(&error); + assert(args); - m = dbus_message_new_method_call( - "org.freedesktop.login1", - path, - "org.freedesktop.DBus.Properties", - "GetAll"); - if (!m) { - log_error("Could not allocate message."); - r = -ENOMEM; - goto finish; - } + show_properties = !strstr(args[0], "status"); - 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; - } + pager_open_if_enabled(); - 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 (show_properties && n <= 1) { + /* If not argument is specified inspect the manager + * itself */ + r = bus_print_all_properties(bus, "org.freedesktop.login1", "/org/freedesktop/login1", NULL, arg_all); + if (r < 0) + log_error("Failed to query login manager."); - 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; + return r; } - 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; - } + for (i = 1; i < n; 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; - dbus_message_iter_recurse(&sub, &sub2); + if (i != 1) + printf("\n"); - if (bus_iter_get_basic_and_next(&sub2, DBUS_TYPE_STRING, &name, true) < 0) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; + r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL); + if (r < 0) { + log_error("Failed to look up user %s: %s", args[i], strerror(-r)); + return r; } - if (dbus_message_iter_get_arg_type(&sub2) != DBUS_TYPE_VARIANT) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; + 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; } - dbus_message_iter_recurse(&sub2, &sub3); + r = sd_bus_message_read(reply, "o", &path); + if (r < 0) + return bus_log_parse_error(r); 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); + r = bus_print_all_properties(bus, "org.freedesktop.login1", path, NULL, arg_all); else - r = status_property_seat(name, &sub3, &seat_info); - + r = print_user_status_info(bus, path); if (r < 0) { - log_error("Failed to parse reply."); - r = -EIO; - goto finish; + log_error("Failed to query user: %s", strerror(-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); - - 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 show(DBusConnection *bus, char **args, unsigned n) { - DBusMessage *m = NULL, *reply = NULL; - int r, ret = 0; - DBusError error; +static int show_seat(sd_bus *bus, char **args, unsigned n) { + bool show_properties; unsigned i; - bool show_properties, new_line = false; + int r; assert(bus); assert(args); - dbus_error_init(&error); - show_properties = !strstr(args[0], "status"); - if (show_properties) - pager_open_if_enabled(); + pager_open_if_enabled(); if (show_properties && n <= 1) { /* If not argument is specified inspect the manager * itself */ + r = bus_print_all_properties(bus, "org.freedesktop.login1", "/org/freedesktop/login1", NULL, arg_all); + if (r < 0) + log_error("Failed to query login manager."); - ret = show_one(args[0], bus, "/org/freedesktop/login1", show_properties, &new_line); - goto finish; + return r; } for (i = 1; i < n; 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; - 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 (i != 1) + printf("\n"); - 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; - } + r = sd_bus_call_method( + bus, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "GetSeat", + &error, &reply, + "s", args[i]); + if (r < 0) { + log_error("Failed to get seat: %s", bus_error_message(&error, r)); + return r; } - 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_read(reply, "o", &path); + if (r < 0) + return bus_log_parse_error(r); - 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; + if (show_properties) + r = bus_print_all_properties(bus, "org.freedesktop.login1", path, NULL, arg_all); + else + r = print_seat_status_info(bus, path); + if (r < 0) { + log_error("Failed to query seat: %s", strerror(-r)); + return r; } - - 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); - - if (reply) - dbus_message_unref(reply); - - dbus_error_free(&error); - - return ret; + return 0; } -static int activate(DBusConnection *bus, char **args, unsigned n) { - DBusMessage *m = NULL; - int ret = 0; - DBusError error; +static int activate(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; unsigned i; + int r; - assert(bus); assert(args); - dbus_error_init(&error); - for (i = 1; i < n; i++) { - DBusMessage *reply; - m = dbus_message_new_method_call( + r = sd_bus_call_method ( + bus, "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; - } - - 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; + "ActivateSession", + &error, NULL, + "s", args[i]); + if (r < 0) { + log_error("Failed to issue method call: %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; +static int kill_session(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; unsigned i; + 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; - - 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 (!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; - } - - 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", + "KillSession", + &error, NULL, + "ssi", args[i], arg_kill_who, arg_signal); + if (r < 0) { + log_error("Could not kill session: %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 enable_linger(DBusConnection *bus, char **args, unsigned n) { - DBusMessage *m = NULL; - int ret = 0; - DBusError error; +static int enable_linger(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; unsigned i; - dbus_bool_t b, interactive = true; + bool b; + int r; - assert(bus); assert(args); - dbus_error_init(&error); + polkit_agent_open_if_enabled(); b = streq(args[0], "enable-linger"); for (i = 1; i < n; i++) { - DBusMessage *reply; - uint32_t u; uid_t uid; - 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; - } - - 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; - } - - 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; + r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL); + if (r < 0) { + log_error("Failed to look up user %s: %s", args[i], strerror(-r)); + return r; } - 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", + "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; } - - dbus_message_unref(m); - dbus_message_unref(reply); - m = reply = NULL; } - ret = 0; - -finish: - if (m) - dbus_message_unref(m); - - dbus_error_free(&error); - - return ret; + return 0; } -static int terminate_user(DBusConnection *bus, char **args, unsigned n) { - DBusMessage *m = NULL; - int ret = 0; - DBusError error; +static int terminate_user(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; unsigned i; + 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; + r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL); + if (r < 0) { + log_error("Failed to look up user %s: %s", args[i], strerror(-r)); + return r; } - 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", + "TerminateUser", + &error, NULL, + "u", (uint32_t) uid); + if (r < 0) { + log_error("Could not terminate user: %s", bus_error_message(&error, -r)); + return r; } - - dbus_message_unref(m); - dbus_message_unref(reply); - m = reply = NULL; } - ret = 0; - -finish: - if (m) - dbus_message_unref(m); - - dbus_error_free(&error); - - return ret; + return 0; } -static int kill_user(DBusConnection *bus, char **args, unsigned n) { - DBusMessage *m = NULL; - int ret = 0; - DBusError error; +static int kill_user(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; unsigned i; + 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; + r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL); + if (r < 0) { + log_error("Failed to look up user %s: %s", args[i], strerror(-r)); + return r; } - 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", + "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; } - - dbus_message_unref(m); - dbus_message_unref(reply); - m = reply = NULL; } - ret = 0; - -finish: - if (m) - dbus_message_unref(m); - - dbus_error_free(&error); - - return ret; + return 0; } -static int attach(DBusConnection *bus, char **args, unsigned n) { - DBusMessage *m = NULL; - int ret = 0; - DBusError error; +static int attach(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; unsigned i; - dbus_bool_t interactive = true; + int r; - assert(bus); assert(args); - dbus_error_init(&error); + polkit_agent_open_if_enabled(); 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; - } + r = sd_bus_call_method ( + bus, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "AttachDevice", + &error, NULL, + "ssb", args[1], args[i], true); - 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 (r < 0) { + log_error("Could not attach device: %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 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 flush_devices(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + int r; - assert(bus); assert(args); - dbus_error_init(&error); + 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; - } + "FlushDevices", + &error, NULL, + "b", true); + if (r < 0) + log_error("Could not flush devices: %s", bus_error_message(&error, -r)); - 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; - } + return r; +} -finish: - if (m) - dbus_message_unref(m); +static int lock_sessions(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + int r; - if (reply) - dbus_message_unref(reply); + assert(args); - dbus_error_free(&error); + r = sd_bus_call_method ( + bus, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + streq(args[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 terminate_seat(DBusConnection *bus, char **args, unsigned n) { - DBusMessage *m = NULL; - int ret = 0; - DBusError error; +static int terminate_seat(sd_bus *bus, char **args, unsigned n) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; unsigned i; + 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; + r = sd_bus_call_method ( + bus, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "TerminateSeat", + &error, NULL, + "s", args[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 help(void) { 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" + " -h --help Show this help\n" + " --version Show package version\n" + " --no-pager Do not pipe output into a pager\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\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", + " 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" + " 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" + " 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); return 0; @@ -1684,20 +1070,23 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_NO_PAGER, - ARG_KILL_WHO + 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 }, + { "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 }, + {} }; int c; @@ -1705,17 +1094,15 @@ static int parse_argv(int argc, char *argv[]) { 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(); - return 0; + return help(); case ARG_VERSION: puts(PACKAGE_STRING); - puts(DISTRIBUTION); puts(SYSTEMD_FEATURES); return 0; @@ -1740,10 +1127,18 @@ static int parse_argv(int argc, char *argv[]) { arg_all = true; break; + case 'l': + arg_full = true; + break; + case ARG_NO_PAGER: arg_no_pager = true; break; + case ARG_NO_ASK_PASSWORD: + arg_ask_password = false; + break; + case ARG_KILL_WHO: arg_kill_who = optarg; break; @@ -1756,12 +1151,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_CONTAINER; arg_host = optarg; break; @@ -1769,15 +1165,14 @@ 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 int loginctl_main(sd_bus *bus, int argc, char *argv[]) { static const struct { const char* verb; @@ -1787,29 +1182,31 @@ static int loginctl_main(DBusConnection *bus, int argc, char *argv[], DBusError EQUAL } argc_cmp; const int argc; - int (* const dispatch)(DBusConnection *bus, char **args, unsigned n); + int (* const dispatch)(sd_bus *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 }, + { "list-sessions", LESS, 1, list_sessions }, + { "session-status", MORE, 2, show_session }, + { "show-session", MORE, 1, show_session }, + { "activate", EQUAL, 2, activate }, + { "lock-session", MORE, 2, activate }, + { "unlock-session", MORE, 2, activate }, + { "lock-sessions", EQUAL, 1, lock_sessions }, + { "unlock-sessions", EQUAL, 1, lock_sessions }, + { "terminate-session", MORE, 2, activate }, + { "kill-session", MORE, 2, kill_session }, + { "list-users", EQUAL, 1, list_users }, + { "user-status", MORE, 2, show_user }, + { "show-user", MORE, 1, show_user }, + { "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_seat }, + { "show-seat", MORE, 1, show_seat }, + { "attach", MORE, 3, attach }, + { "flush-devices", EQUAL, 1, flush_devices }, + { "terminate-seat", MORE, 2, terminate_seat }, }; int left; @@ -1817,7 +1214,6 @@ static int loginctl_main(DBusConnection *bus, int argc, char *argv[], DBusError assert(argc >= 0); assert(argv); - assert(error); left = argc - optind; @@ -1870,57 +1266,33 @@ static int loginctl_main(DBusConnection *bus, int argc, char *argv[], DBusError 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); } -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_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("Failed to create bus connection: %s", strerror(-r)); 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..."); - - r = loginctl_main(bus, argc, argv, &error); - retval = r < 0 ? EXIT_FAILURE : r; + r = loginctl_main(bus, argc, argv); finish: - if (bus) { - dbus_connection_flush(bus); - dbus_connection_close(bus); - dbus_connection_unref(bus); - } - - dbus_error_free(&error); - dbus_shutdown(); + pager_close(); strv_free(arg_property); - pager_close(); - - return retval; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }