X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Floginctl.c;h=450fbc1ebad10f576218703b6c0242cce90d0569;hb=9f751b60fbe45dfc9fb17c5ec6452b68e9e0a89a;hp=ee9816ad07628020b9d1b6d3140735f0ccbab91b;hpb=8331cb6e143dc261fd22af9a2a679196822326a9;p=elogind.git diff --git a/src/login/loginctl.c b/src/login/loginctl.c index ee9816ad0..450fbc1eb 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -37,7 +37,7 @@ #include "parse-util.h" #include "process-util.h" #include "signal-util.h" -#include "spawn-polkit-agent.h" +//#include "spawn-polkit-agent.h" #include "strv.h" #include "sysfs-show.h" #include "terminal-util.h" @@ -46,45 +46,35 @@ #include "util.h" #include "verbs.h" -/// Additional includes for elogind -#include "logind-action.h" -#include "musl_missing.h" -#include "sd-login.h" -#include "virt.h" +/// Additional includes needed by elogind +#include "eloginctl.h" static char **arg_property = NULL; static bool arg_all = false; static bool arg_value = false; static bool arg_full = false; static bool arg_no_pager = false; -static bool arg_no_wall = false; static bool arg_legend = true; static const char *arg_kill_who = NULL; static int arg_signal = SIGTERM; +#if 0 /// UNNEEDED by elogind static BusTransport arg_transport = BUS_TRANSPORT_LOCAL; static char *arg_host = NULL; -static usec_t arg_when = 0; -static char **arg_wall = NULL; static bool arg_ask_password = true; -static bool arg_ignore_inhibitors = false; -#if 0 /// UNNEEDED by elogind static unsigned arg_lines = 10; static OutputMode arg_output = OUTPUT_SHORT; +#else +/// Instead we need this: +extern BusTransport arg_transport; +static char *arg_host = NULL; +extern bool arg_ask_password; +extern bool arg_no_wall; +extern usec_t arg_when; +extern bool arg_ignore_inhibitors; +extern elogind_action arg_action; #endif // 0 -static enum action { - _ACTION_INVALID, - ACTION_HALT, - ACTION_POWEROFF, - ACTION_REBOOT, - ACTION_KEXEC, - ACTION_SUSPEND, - ACTION_HIBERNATE, - ACTION_HYBRID_SLEEP, - ACTION_CANCEL_SHUTDOWN, - _ACTION_MAX -} arg_action; - +#if 0 /// UNNEEDED by elogind static void polkit_agent_open_if_enabled(void) { /* Open the polkit agent as a child process if necessary */ @@ -98,7 +88,6 @@ static void polkit_agent_open_if_enabled(void) { polkit_agent_open(); } -#if 0 /// UNNEEDED by elogind static OutputFlags get_output_flags(void) { return @@ -109,6 +98,34 @@ static OutputFlags get_output_flags(void) { } #endif // 0 +static int get_session_path(sd_bus *bus, const char *session_id, sd_bus_error *error, char **path) { + _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; + int r; + char *ans; + + r = sd_bus_call_method( + bus, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "GetSession", + error, &reply, + "s", session_id); + if (r < 0) + return r; + + r = sd_bus_message_read(reply, "o", &ans); + if (r < 0) + return r; + + ans = strdup(ans); + if (!ans) + return -ENOMEM; + + *path = ans; + return 0; +} + static int list_sessions(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; @@ -141,10 +158,38 @@ static int list_sessions(int argc, char *argv[], void *userdata) { return bus_log_parse_error(r); if (arg_legend) - printf("%10s %10s %-16s %-16s\n", "SESSION", "UID", "USER", "SEAT"); + printf("%10s %10s %-16s %-16s %-16s\n", "SESSION", "UID", "USER", "SEAT", "TTY"); 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); + _cleanup_(sd_bus_error_free) sd_bus_error error2 = SD_BUS_ERROR_NULL; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply2 = NULL; + _cleanup_free_ char *path = NULL; + const char *tty = NULL; + + r = get_session_path(bus, id, &error2, &path); + if (r < 0) + log_warning("Failed to get session path: %s", bus_error_message(&error, r)); + else { + r = sd_bus_get_property( + bus, + "org.freedesktop.login1", + path, + "org.freedesktop.login1.Session", + "TTY", + &error2, + &reply2, + "s"); + if (r < 0) + log_warning("Failed to get TTY for session %s: %s", + id, bus_error_message(&error2, r)); + else { + r = sd_bus_message_read(reply2, "s", &tty); + if (r < 0) + return bus_log_parse_error(r); + } + } + + printf("%10s %10"PRIu32" %-16s %-16s %-16s\n", id, uid, user, seat, strna(tty)); k++; } if (r < 0) @@ -191,7 +236,7 @@ static int list_users(int argc, char *argv[], void *userdata) { 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); + printf("%10"PRIu32" %-16s\n", uid, user); k++; } if (r < 0) @@ -318,7 +363,7 @@ typedef struct SessionStatusInfo { char *seat; char *tty; char *display; - bool remote; + int remote; char *remote_host; char *remote_user; char *service; @@ -332,7 +377,7 @@ typedef struct SessionStatusInfo { typedef struct UserStatusInfo { uid_t uid; - bool linger; + int linger; char *name; struct dual_timestamp timestamp; char *state; @@ -490,9 +535,9 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li printf("%s - ", strna(i.id)); if (i.name) - printf("%s (%u)\n", i.name, (unsigned) i.uid); + printf("%s (%"PRIu32")\n", i.name, i.uid); else - printf("%u\n", (unsigned) i.uid); + printf("%"PRIu32"\n", i.uid); s1 = format_timestamp_relative(since1, sizeof(since1), i.timestamp.realtime); s2 = format_timestamp(since2, sizeof(since2), i.timestamp.realtime); @@ -505,7 +550,7 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li if (i.leader > 0) { _cleanup_free_ char *t = NULL; - printf("\t Leader: %u", (unsigned) i.leader); + printf("\t Leader: %"PRIu32, i.leader); get_process_comm(i.leader, &t); if (t) @@ -619,9 +664,9 @@ static int print_user_status_info(sd_bus *bus, const char *path, bool *new_line) *new_line = true; if (i.name) - printf("%s (%u)\n", i.name, (unsigned) i.uid); + printf("%s (%"PRIu32")\n", i.name, i.uid); else - printf("%u\n", (unsigned) i.uid); + printf("%"PRIu32"\n", i.uid); s1 = format_timestamp_relative(since1, sizeof(since1), i.timestamp.realtime); s2 = format_timestamp(since2, sizeof(since2), i.timestamp.realtime); @@ -919,26 +964,14 @@ static int show_session(int argc, char *argv[], void *userdata) { for (i = 1; i < argc; i++) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_(sd_bus_message_unrefp) sd_bus_message * reply = NULL; - const char *path = NULL; + _cleanup_free_ 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]); + r = get_session_path(bus, argv[1], &error, &path); if (r < 0) { - log_error("Failed to get session: %s", bus_error_message(&error, r)); + log_error("Failed to get session path: %s", bus_error_message(&error, r)); return r; } - r = sd_bus_message_read(reply, "o", &path); - if (r < 0) - return bus_log_parse_error(r); - if (properties) r = show_properties(bus, path, &new_line); else @@ -1372,321 +1405,6 @@ static int terminate_seat(int argc, char *argv[], void *userdata) { return 0; } -static int logind_set_wall_message(sd_bus* bus, const char* msg) { - _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_free_ char *m = NULL; - int r; - - if (strv_extend(&arg_wall, msg) < 0) - return log_oom(); - - m = strv_join(arg_wall, " "); - if (!m) - return log_oom(); - - r = sd_bus_call_method( - bus, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "SetWallMessage", - &error, - NULL, - "sb", - m, - !arg_no_wall); - - if (r < 0) - return log_warning_errno(r, "Failed to set wall message, ignoring: %s", bus_error_message(&error, r)); - - return 0; -} - -/* Ask elogind, which might grant access to unprivileged users - * through PolicyKit */ -static int elogind_reboot(sd_bus *bus, enum action a) { - _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; - const char *method; - int r; - static const char *table[_ACTION_MAX] = { - [ACTION_REBOOT] = "The system is going down for reboot NOW!", - [ACTION_POWEROFF] = "The system is going down for power-off NOW!", - [ACTION_CANCEL_SHUTDOWN] = "The system shutdown has been cancelled NOW!" - }; - - if (!bus) - return -EIO; - - polkit_agent_open_if_enabled(); - - switch (a) { - - case ACTION_POWEROFF: - method = "PowerOff"; - break; - - case ACTION_REBOOT: - method = "Reboot"; - break; - - case ACTION_SUSPEND: - method = "Suspend"; - break; - - case ACTION_HIBERNATE: - method = "Hibernate"; - break; - - case ACTION_HYBRID_SLEEP: - method = "HybridSleep"; - break; - - case ACTION_CANCEL_SHUTDOWN: - method = "CancelScheduledShutdown"; - break; - - default: - return -EINVAL; - } - - r = logind_set_wall_message(bus, table[a]); - if (r < 0) { - log_warning_errno(r, "Failed to set wall message, ignoring: %s", - bus_error_message(&error, r)); - sd_bus_error_free(&error); - } - - r = sd_bus_call_method( - bus, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - method, - &error, - NULL, - "b", arg_ask_password); - if (r < 0) - log_error("Failed to execute operation: %s", bus_error_message(&error, r)); - - return r; -} - -static const struct { - HandleAction action; - const char* verb; -} action_table[_ACTION_MAX] = { - [ACTION_POWEROFF] = { HANDLE_POWEROFF, "poweroff", }, - [ACTION_REBOOT] = { HANDLE_REBOOT, "reboot", }, - [ACTION_SUSPEND] = { HANDLE_SUSPEND, "suspend", }, - [ACTION_HIBERNATE] = { HANDLE_HIBERNATE, "hibernate", }, - [ACTION_HYBRID_SLEEP] = { HANDLE_HYBRID_SLEEP, "hybrid-sleep" }, -}; - -static enum action verb_to_action(const char *verb) { - enum action i; - - for (i = _ACTION_INVALID; i < _ACTION_MAX; i++) - if (streq_ptr(action_table[i].verb, verb)) - return i; - - return _ACTION_INVALID; -} - -static int parse_shutdown_time_spec(const char *t, usec_t *_u) { - assert(t); - assert(_u); - - if (streq(t, "now")) - *_u = 0; - else if (!strchr(t, ':')) { - uint64_t u; - - if (safe_atou64(t, &u) < 0) - return -EINVAL; - - *_u = now(CLOCK_REALTIME) + USEC_PER_MINUTE * u; - } else { - char *e = NULL; - long hour, minute; - struct tm tm = {}; - time_t s; - usec_t n; - - errno = 0; - hour = strtol(t, &e, 10); - if (errno > 0 || *e != ':' || hour < 0 || hour > 23) - return -EINVAL; - - minute = strtol(e+1, &e, 10); - if (errno > 0 || *e != 0 || minute < 0 || minute > 59) - return -EINVAL; - - n = now(CLOCK_REALTIME); - s = (time_t) (n / USEC_PER_SEC); - - assert_se(localtime_r(&s, &tm)); - - tm.tm_hour = (int) hour; - tm.tm_min = (int) minute; - tm.tm_sec = 0; - - assert_se(s = mktime(&tm)); - - *_u = (usec_t) s * USEC_PER_SEC; - - while (*_u <= n) - *_u += USEC_PER_DAY; - } - - return 0; -} - -static int check_inhibitors(sd_bus* bus, enum action a) { - _cleanup_(sd_bus_message_unrefp) 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; - - if (arg_ignore_inhibitors) - return 0; - - if (arg_when > 0) - return 0; - - if (geteuid() == 0) - return 0; - - if (!on_tty()) - return 0; - - 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; - - r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssssuu)"); - if (r < 0) - return bus_log_parse_error(r); - - 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; - - if (!streq(mode, "block")) - continue; - - sv = strv_split(what, ":"); - if (!sv) - return log_oom(); - - if ((pid_t) pid < 0) - return log_error_errno(ERANGE, "Bad PID %"PRIu32": %m", pid); - - if (!strv_contains(sv, - IN_SET(a, - ACTION_HALT, - ACTION_POWEROFF, - ACTION_REBOOT, - ACTION_KEXEC) ? "shutdown" : "sleep")) - continue; - - get_process_comm(pid, &comm); - user = uid_to_name(uid); - - log_warning("Operation inhibited by \"%s\" (PID "PID_FMT" \"%s\", user %s), reason is \"%s\".", - who, (pid_t) pid, strna(comm), strna(user), why); - - c++; - } - if (r < 0) - return bus_log_parse_error(r); - - r = sd_bus_message_exit_container(reply); - if (r < 0) - return bus_log_parse_error(r); - - /* 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; - - if (sd_session_get_uid(*s, &uid) < 0 || uid == getuid()) - continue; - - if (sd_session_get_class(*s, &class) < 0 || !streq(class, "user")) - continue; - - if (sd_session_get_type(*s, &type) < 0 || (!streq(type, "x11") && !streq(type, "tty"))) - continue; - - sd_session_get_tty(*s, &tty); - sd_session_get_seat(*s, &seat); - sd_session_get_service(*s, &service); - user = uid_to_name(uid); - - log_warning("User %s is logged in on %s.", strna(user), isempty(tty) ? (isempty(seat) ? strna(service) : seat) : tty); - c++; - } - - if (c <= 0) - return 0; - - log_error("Please retry operation after closing inhibitors and logging out other users.\nAlternatively, ignore inhibitors and users with 'systemctl %s -i'.", - action_table[a].verb); - - return -EPERM; -} - -static int start_special(int argc, char *argv[], void *userdata) { - sd_bus *bus = userdata; - enum action a; - int r; - - assert(argv); - - a = verb_to_action(argv[0]); - - r = check_inhibitors(bus, a); - if (r < 0) - return r; - - /* Now power off actions in chroot environments */ - if ((a == ACTION_POWEROFF || - a == ACTION_REBOOT) && - (running_in_chroot() > 0) ) { - log_info("Running in chroot, ignoring request."); - return 0; - } - - /* Switch to cancel shutdown, if a shutdown action was requested, - and the option to cancel it was set: */ - if ((a == ACTION_POWEROFF || - a == ACTION_REBOOT) && - (arg_action == ACTION_CANCEL_SHUTDOWN)) - return elogind_reboot(bus, arg_action); - - /* Otherwise perform requested action */ - if (a == ACTION_POWEROFF || - a == ACTION_REBOOT || - a == ACTION_SUSPEND || - a == ACTION_HIBERNATE || - a == ACTION_HYBRID_SLEEP) - return elogind_reboot(bus, a); - - return -EOPNOTSUPP; -} - static int help(int argc, char *argv[], void *userdata) { printf("%s [OPTIONS...] {COMMAND} ...\n\n" @@ -1694,7 +1412,9 @@ static int help(int argc, char *argv[], void *userdata) { " -h --help Show this help\n" " --version Show package version\n" " --no-pager Do not pipe output into a pager\n" +#if 1 /// elogind supports --no-wall " --no-wall Do not print any wall message\n" +#endif // 1 " --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" @@ -1709,9 +1429,11 @@ static int help(int argc, char *argv[], void *userdata) { " -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" +#else + /// elogind can cancel shutdowns and allows to ignore inhibitors + " -c Cancel a pending shutdown or reboot\n" + " -i --ignore-inhibitors When shutting down or sleeping, ignore inhibitors\n\n" #endif // 0 - " -c Cancel a pending shutdown\n" - " -i --ignore-inhibitors When shutting down or sleeping, ignore inhibitors\n" "Session Commands:\n" " list-sessions List sessions\n" " session-status [ID...] Show session status\n" @@ -1737,13 +1459,15 @@ static int help(int argc, char *argv[], void *userdata) { " 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" + " terminate-seat NAME... Terminate all sessions on one or more seats\n\n" +#if 1 /// elogind adds some system commands to loginctl "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" + " poweroff [TIME] [WALL...] Turn off the machine\n" + " reboot [TIME] [WALL...] 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" +#endif // 1 , program_invocation_short_name); return 0; @@ -1755,7 +1479,9 @@ static int parse_argv(int argc, char *argv[]) { ARG_VERSION = 0x100, ARG_VALUE, ARG_NO_PAGER, +#if 1 /// elogind supports --no-wall ARG_NO_WALL, +#endif // 1 ARG_NO_LEGEND, ARG_KILL_WHO, ARG_NO_ASK_PASSWORD, @@ -1769,7 +1495,9 @@ static int parse_argv(int argc, char *argv[]) { { "value", no_argument, NULL, ARG_VALUE }, { "full", no_argument, NULL, 'l' }, { "no-pager", no_argument, NULL, ARG_NO_PAGER }, +#if 1 /// elogind supports --no-wall { "no-wall", no_argument, NULL, ARG_NO_WALL }, +#endif // 1 { "no-legend", no_argument, NULL, ARG_NO_LEGEND }, { "kill-who", required_argument, NULL, ARG_KILL_WHO }, { "signal", required_argument, NULL, 's' }, @@ -1779,18 +1507,23 @@ static int parse_argv(int argc, char *argv[]) { #if 0 /// UNNEEDED by elogind { "lines", required_argument, NULL, 'n' }, { "output", required_argument, NULL, 'o' }, -#endif // 0 +#else + /// elogind allows to ignore inhibitors for system commands. { "ignore-inhibitors", no_argument, NULL, 'i' }, +#endif // 0 {} }; - char **wall = NULL; int c, r; assert(argc >= 0); assert(argv); +#if 0 /// elogind adds some system commands to loginctl + while ((c = getopt_long(argc, argv, "hp:als:H:M:n:o:", options, NULL)) >= 0) +#else while ((c = getopt_long(argc, argv, "hp:als:H:M:n:o:ci", options, NULL)) >= 0) +#endif // 0 switch (c) { @@ -1845,10 +1578,11 @@ static int parse_argv(int argc, char *argv[]) { case ARG_NO_PAGER: arg_no_pager = true; break; - +#if 1 /// elogind supports --no-wall case ARG_NO_WALL: arg_no_wall = true; break; +#endif // 1 case ARG_NO_LEGEND: arg_legend = false; @@ -1879,7 +1613,7 @@ static int parse_argv(int argc, char *argv[]) { arg_transport = BUS_TRANSPORT_MACHINE; arg_host = optarg; break; - +#if 1 /// elogind can cancel shutdowns and allows to ignore inhibitors case 'c': arg_action = ACTION_CANCEL_SHUTDOWN; break; @@ -1887,7 +1621,7 @@ static int parse_argv(int argc, char *argv[]) { case 'i': arg_ignore_inhibitors = true; break; - +#endif // 1 case '?': return -EINVAL; @@ -1895,30 +1629,6 @@ static int parse_argv(int argc, char *argv[]) { assert_not_reached("Unhandled option"); } - if (argc > optind && arg_action != ACTION_CANCEL_SHUTDOWN) { - r = parse_shutdown_time_spec(argv[optind], &arg_when); - if (r < 0) { - log_error("Failed to parse time specification: %s", argv[optind]); - return r; - } - } else - arg_when = now(CLOCK_REALTIME) + USEC_PER_MINUTE; - - if (argc > optind && arg_action == ACTION_CANCEL_SHUTDOWN) - /* No time argument for shutdown cancel */ - wall = argv + optind; - else if (argc > optind + 1) - /* We skip the time argument */ - wall = argv + optind + 1; - - if (wall) { - arg_wall = strv_copy(wall); - if (!arg_wall) - return log_oom(); - } - - optind = argc; - return 1; } @@ -1949,20 +1659,26 @@ static int loginctl_main(int argc, char *argv[], sd_bus *bus) { { "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, start_special }, - { "reboot", VERB_ANY, 1, 0, start_special }, +#if 1 /// elogind adds some system commands to loginctl + { "poweroff", VERB_ANY, VERB_ANY, 0, start_special }, + { "reboot", VERB_ANY, VERB_ANY, 0, start_special }, { "suspend", VERB_ANY, 1, 0, start_special }, { "hibernate", VERB_ANY, 1, 0, start_special }, { "hybrid-sleep", VERB_ANY, 1, 0, start_special }, { "cancel-shutdown", VERB_ANY, 1, 0, start_special }, +#endif // 1 {} }; +#if 1 /// elogind can do shutdown and allows its cancellation + if ((argc == optind) && (ACTION_CANCEL_SHUTDOWN == arg_action)) + return elogind_cancel_shutdown(bus); +#endif // 1 return dispatch_verb(argc, argv, verbs, bus); } int main(int argc, char *argv[]) { - _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; + sd_bus *bus = NULL; int r; setlocale(LC_ALL, ""); @@ -1985,11 +1701,17 @@ int main(int argc, char *argv[]) { r = loginctl_main(argc, argv, bus); finish: + sd_bus_flush_close_unref(bus); + pager_close(); +#if 0 /// elogind does that in elogind_cleanup() polkit_agent_close(); +#endif // 0 strv_free(arg_property); - strv_free(arg_wall); +#if 1 /// elogind has some own cleanups to do + elogind_cleanup(); +#endif // 1 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }