From: Andy Wingo Date: Sun, 23 Aug 2015 09:17:14 +0000 (+0200) Subject: Remove support for auto-spawning VTs X-Git-Tag: v226.4~1^2~164 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1c627e6a1ffe67022a3610a07613e690e9d0752a;p=elogind.git Remove support for auto-spawning VTs Auto-spawning VTs requires systemd in practice. If you're using systemd you can just use its logind :) --- diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 59f5f8cc0..c566159d3 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -429,7 +429,7 @@ static int vt_is_busy(unsigned int vtnr) { return r; } -static bool manager_is_docked(Manager *m) { +bool manager_is_docked(Manager *m) { Iterator i; Button *b; @@ -440,7 +440,7 @@ static bool manager_is_docked(Manager *m) { return false; } -static int manager_count_external_displays(Manager *m) { +int manager_count_displays(Manager *m) { _cleanup_udev_enumerate_unref_ struct udev_enumerate *e = NULL; struct udev_list_entry *item = NULL, *first = NULL; int r; @@ -462,8 +462,7 @@ static int manager_count_external_displays(Manager *m) { udev_list_entry_foreach(item, first) { _cleanup_udev_device_unref_ struct udev_device *d = NULL; struct udev_device *p; - const char *status, *enabled, *dash, *nn, *i; - bool external = false; + const char *status; d = udev_device_new_from_syspath(m->udev, udev_list_entry_get_name(item)); if (!d) @@ -479,40 +478,6 @@ static int manager_count_external_displays(Manager *m) { if (!streq_ptr(udev_device_get_subsystem(p), "drm")) continue; - nn = udev_device_get_sysname(d); - if (!nn) - continue; - - /* Ignore internal displays: the type is encoded in - * the sysfs name, as the second dash seperated item - * (the first is the card name, the last the connector - * number). We implement a whitelist of external - * displays here, rather than a whitelist, to ensure - * we don't block suspends too eagerly. */ - dash = strchr(nn, '-'); - if (!dash) - continue; - - dash++; - FOREACH_STRING(i, "VGA-", "DVI-I-", "DVI-D-", "DVI-A-" - "Composite-", "SVIDEO-", "Component-", - "DIN-", "DP-", "HDMI-A-", "HDMI-B-", "TV-") { - - if (startswith(dash, i)) { - external = true; - break; - } - } - if (!external) - continue; - - /* Ignore ports that are not enabled */ - enabled = udev_device_get_sysattr_value(d, "enabled"); - if (!enabled) - continue; - if (!streq_ptr(enabled, "enabled")) - continue; - /* We count any connector which is not explicitly * "disconnected" as connected. */ status = udev_device_get_sysattr_value(d, "status"); @@ -523,7 +488,7 @@ static int manager_count_external_displays(Manager *m) { return n; } -bool manager_is_docked_or_external_displays(Manager *m) { +bool manager_is_docked_or_multiple_displays(Manager *m) { int n; /* If we are docked don't react to lid closing */ @@ -534,11 +499,11 @@ bool manager_is_docked_or_external_displays(Manager *m) { /* If we have more than one display connected, * assume that we are docked. */ - n = manager_count_external_displays(m); + n = manager_count_displays(m); if (n < 0) log_warning_errno(n, "Display counting failed: %m"); - else if (n >= 1) { - log_debug("External (%i) displays connected.", n); + else if (n > 1) { + log_debug("Multiple (%i) displays connected.", n); return true; } diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index e142b8fcf..c5f2faee7 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -38,12 +38,7 @@ #include "bus-common-errors.h" #include "udev-util.h" #include "selinux-util.h" -#include "efivars.h" #include "logind.h" -#include "formats-util.h" -#include "process-util.h" -#include "terminal-util.h" -#include "utmp-wtmp.h" int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Session **ret) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; @@ -158,7 +153,7 @@ static int property_get_idle_since_hint( sd_bus_error *error) { Manager *m = userdata; - dual_timestamp t = DUAL_TIMESTAMP_NULL; + dual_timestamp t; assert(bus); assert(reply); @@ -214,60 +209,16 @@ static int property_get_preparing( return sd_bus_message_append(reply, "b", b); } -static int property_get_scheduled_shutdown( - sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) { - - Manager *m = userdata; - int r; - - assert(bus); - assert(reply); - assert(m); - - r = sd_bus_message_open_container(reply, 'r', "st"); - if (r < 0) - return r; - - r = sd_bus_message_append(reply, "st", m->scheduled_shutdown_type, m->scheduled_shutdown_timeout); - if (r < 0) - return r; - - return sd_bus_message_close_container(reply); -} - static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_handle_action, handle_action, HandleAction); -static int property_get_docked( - sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) { - - Manager *m = userdata; - - assert(bus); - assert(reply); - assert(m); - - return sd_bus_message_append(reply, "b", manager_is_docked_or_external_displays(m)); -} - -static int method_get_session(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_get_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *p = NULL; Manager *m = userdata; const char *name; Session *session; int r; + assert(bus); assert(message); assert(m); @@ -286,13 +237,14 @@ static int method_get_session(sd_bus_message *message, void *userdata, sd_bus_er return sd_bus_reply_method_return(message, "o", p); } -static int method_get_session_by_pid(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_get_session_by_pid(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *p = NULL; Session *session = NULL; Manager *m = userdata; pid_t pid; int r; + assert(bus); assert(message); assert(m); @@ -322,13 +274,14 @@ static int method_get_session_by_pid(sd_bus_message *message, void *userdata, sd return sd_bus_reply_method_return(message, "o", p); } -static int method_get_user(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_get_user(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *p = NULL; Manager *m = userdata; uint32_t uid; User *user; int r; + assert(bus); assert(message); assert(m); @@ -347,13 +300,14 @@ static int method_get_user(sd_bus_message *message, void *userdata, sd_bus_error return sd_bus_reply_method_return(message, "o", p); } -static int method_get_user_by_pid(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_get_user_by_pid(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *p = NULL; Manager *m = userdata; User *user = NULL; pid_t pid; int r; + assert(bus); assert(message); assert(m); @@ -382,13 +336,14 @@ static int method_get_user_by_pid(sd_bus_message *message, void *userdata, sd_bu return sd_bus_reply_method_return(message, "o", p); } -static int method_get_seat(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_get_seat(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *p = NULL; Manager *m = userdata; const char *name; Seat *seat; int r; + assert(bus); assert(message); assert(m); @@ -407,13 +362,14 @@ static int method_get_seat(sd_bus_message *message, void *userdata, sd_bus_error return sd_bus_reply_method_return(message, "o", p); } -static int method_list_sessions(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_list_sessions(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; Manager *m = userdata; Session *session; Iterator i; int r; + assert(bus); assert(message); assert(m); @@ -446,16 +402,17 @@ static int method_list_sessions(sd_bus_message *message, void *userdata, sd_bus_ if (r < 0) return r; - return sd_bus_send(NULL, reply, NULL); + return sd_bus_send(bus, reply, NULL); } -static int method_list_users(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_list_users(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; Manager *m = userdata; User *user; Iterator i; int r; + assert(bus); assert(message); assert(m); @@ -486,16 +443,17 @@ static int method_list_users(sd_bus_message *message, void *userdata, sd_bus_err if (r < 0) return r; - return sd_bus_send(NULL, reply, NULL); + return sd_bus_send(bus, reply, NULL); } -static int method_list_seats(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_list_seats(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; Manager *m = userdata; Seat *seat; Iterator i; int r; + assert(bus); assert(message); assert(m); @@ -523,19 +481,16 @@ static int method_list_seats(sd_bus_message *message, void *userdata, sd_bus_err if (r < 0) return r; - return sd_bus_send(NULL, reply, NULL); + return sd_bus_send(bus, reply, NULL); } -static int method_list_inhibitors(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_list_inhibitors(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; Manager *m = userdata; Inhibitor *inhibitor; Iterator i; int r; - assert(message); - assert(m); - r = sd_bus_message_new_method_return(message, &reply); if (r < 0) return r; @@ -561,10 +516,10 @@ static int method_list_inhibitors(sd_bus_message *message, void *userdata, sd_bu if (r < 0) return r; - return sd_bus_send(NULL, reply, NULL); + return sd_bus_send(bus, reply, NULL); } -static int method_create_session(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_create_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { const char *service, *type, *class, *cseat, *tty, *display, *remote_user, *remote_host, *desktop; uint32_t uid, leader, audit_id = 0; _cleanup_free_ char *id = NULL; @@ -578,6 +533,7 @@ static int method_create_session(sd_bus_message *message, void *userdata, sd_bus SessionClass c; int r; + assert(bus); assert(message); assert(m); @@ -689,26 +645,45 @@ static int method_create_session(sd_bus_message *message, void *userdata, sd_bus return r; } - r = manager_get_session_by_pid(m, leader, NULL); - if (r > 0) - return sd_bus_error_setf(error, BUS_ERROR_SESSION_BUSY, "Already running in a session"); - - /* - * Old gdm and lightdm start the user-session on the same VT as - * the greeter session. But they destroy the greeter session - * after the user-session and want the user-session to take - * over the VT. We need to support this for - * backwards-compatibility, so make sure we allow new sessions - * on a VT that a greeter is running on. Furthermore, to allow - * re-logins, we have to allow a greeter to take over a used VT for - * the exact same reasons. - */ - if (c != SESSION_GREETER && - vtnr > 0 && - vtnr < m->seat0->position_count && - m->seat0->positions[vtnr] && - m->seat0->positions[vtnr]->class != SESSION_GREETER) - return sd_bus_error_setf(error, BUS_ERROR_SESSION_BUSY, "Already occupied by a session"); + manager_get_session_by_pid(m, leader, &session); + if (session) { + _cleanup_free_ char *path = NULL; + _cleanup_close_ int fifo_fd = -1; + + /* Session already exists, client is probably + * something like "su" which changes uid but is still + * the same session */ + + fifo_fd = session_create_fifo(session); + if (fifo_fd < 0) + return fifo_fd; + + path = session_bus_path(session); + if (!path) + return -ENOMEM; + + log_debug("Sending reply about an existing session: " + "id=%s object_path=%s uid=%u runtime_path=%s " + "session_fd=%d seat=%s vtnr=%u", + session->id, + path, + (uint32_t) session->user->uid, + session->user->runtime_path, + fifo_fd, + session->seat ? session->seat->id : "", + (uint32_t) session->vtnr); + + return sd_bus_reply_method_return( + message, "soshusub", + session->id, + path, + session->user->runtime_path, + fifo_fd, + (uint32_t) session->user->uid, + session->seat ? session->seat->id : "", + (uint32_t) session->vtnr, + true); + } audit_session_from_pid(leader, &audit_id); if (audit_id > 0) { @@ -843,12 +818,13 @@ fail: return r; } -static int method_release_session(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_release_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; Session *session; const char *name; int r; + assert(bus); assert(message); assert(m); @@ -867,12 +843,13 @@ static int method_release_session(sd_bus_message *message, void *userdata, sd_bu return sd_bus_reply_method_return(message, NULL); } -static int method_activate_session(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_activate_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; Session *session; const char *name; int r; + assert(bus); assert(message); assert(m); @@ -884,16 +861,17 @@ static int method_activate_session(sd_bus_message *message, void *userdata, sd_b if (r < 0) return r; - return bus_session_method_activate(message, session, error); + return bus_session_method_activate(bus, message, session, error); } -static int method_activate_session_on_seat(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_activate_session_on_seat(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { const char *session_name, *seat_name; Manager *m = userdata; Session *session; Seat *seat; int r; + assert(bus); assert(message); assert(m); @@ -922,12 +900,13 @@ static int method_activate_session_on_seat(sd_bus_message *message, void *userda return sd_bus_reply_method_return(message, NULL); } -static int method_lock_session(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_lock_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; Session *session; const char *name; int r; + assert(bus); assert(message); assert(m); @@ -939,13 +918,14 @@ static int method_lock_session(sd_bus_message *message, void *userdata, sd_bus_e if (r < 0) return r; - return bus_session_method_lock(message, session, error); + return bus_session_method_lock(bus, message, session, error); } -static int method_lock_sessions(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_lock_sessions(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; int r; + assert(bus); assert(message); assert(m); @@ -969,12 +949,13 @@ static int method_lock_sessions(sd_bus_message *message, void *userdata, sd_bus_ return sd_bus_reply_method_return(message, NULL); } -static int method_kill_session(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_kill_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { const char *name; Manager *m = userdata; Session *session; int r; + assert(bus); assert(message); assert(m); @@ -986,15 +967,16 @@ static int method_kill_session(sd_bus_message *message, void *userdata, sd_bus_e if (r < 0) return r; - return bus_session_method_kill(message, session, error); + return bus_session_method_kill(bus, message, session, error); } -static int method_kill_user(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_kill_user(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; uint32_t uid; User *user; int r; + assert(bus); assert(message); assert(m); @@ -1006,15 +988,16 @@ static int method_kill_user(sd_bus_message *message, void *userdata, sd_bus_erro if (r < 0) return r; - return bus_user_method_kill(message, user, error); + return bus_user_method_kill(bus, message, user, error); } -static int method_terminate_session(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_terminate_session(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; const char *name; Session *session; int r; + assert(bus); assert(message); assert(m); @@ -1026,15 +1009,16 @@ static int method_terminate_session(sd_bus_message *message, void *userdata, sd_ if (r < 0) return r; - return bus_session_method_terminate(message, session, error); + return bus_session_method_terminate(bus, message, session, error); } -static int method_terminate_user(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_terminate_user(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; uint32_t uid; User *user; int r; + assert(bus); assert(message); assert(m); @@ -1046,15 +1030,16 @@ static int method_terminate_user(sd_bus_message *message, void *userdata, sd_bus if (r < 0) return r; - return bus_user_method_terminate(message, user, error); + return bus_user_method_terminate(bus, message, user, error); } -static int method_terminate_seat(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_terminate_seat(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; const char *name; Seat *seat; int r; + assert(bus); assert(message); assert(m); @@ -1066,10 +1051,10 @@ static int method_terminate_seat(sd_bus_message *message, void *userdata, sd_bus if (r < 0) return r; - return bus_seat_method_terminate(message, seat, error); + return bus_seat_method_terminate(bus, message, seat, error); } -static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_set_user_linger(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *cc = NULL; Manager *m = userdata; int b, r; @@ -1078,6 +1063,7 @@ static int method_set_user_linger(sd_bus_message *message, void *userdata, sd_bu uint32_t uid; int interactive; + assert(bus); assert(message); assert(m); @@ -1184,7 +1170,7 @@ static int trigger_device(Manager *m, struct udev_device *d) { if (!t) return -ENOMEM; - write_string_file(t, "change", WRITE_STRING_FILE_CREATE); + write_string_file(t, "change"); } return 0; @@ -1257,11 +1243,12 @@ static int flush_devices(Manager *m) { return trigger_device(m, NULL); } -static int method_attach_device(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_attach_device(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { const char *sysfs, *seat; Manager *m = userdata; int interactive, r; + assert(bus); assert(message); assert(m); @@ -1295,10 +1282,11 @@ static int method_attach_device(sd_bus_message *message, void *userdata, sd_bus_ return sd_bus_reply_method_return(message, NULL); } -static int method_flush_devices(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_flush_devices(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; int interactive, r; + assert(bus); assert(message); assert(m); @@ -1476,89 +1464,17 @@ static int execute_shutdown_or_sleep( return 0; } -int manager_dispatch_delayed(Manager *manager, bool timeout) { - - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - Inhibitor *offending = NULL; - int r; - - assert(manager); - - if (manager->action_what == 0 || manager->action_job) - return 0; - - if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0, &offending)) { - _cleanup_free_ char *comm = NULL, *u = NULL; - - if (!timeout) - return 0; - - (void) get_process_comm(offending->pid, &comm); - u = uid_to_name(offending->uid); - - log_notice("Delay lock is active (UID "UID_FMT"/%s, PID "PID_FMT"/%s) but inhibitor timeout is reached.", - offending->uid, strna(u), - offending->pid, strna(comm)); - } - - /* Actually do the operation */ - r = execute_shutdown_or_sleep(manager, manager->action_what, manager->action_unit, &error); - if (r < 0) { - log_warning("Failed to send delayed message: %s", bus_error_message(&error, r)); - - manager->action_unit = NULL; - manager->action_what = 0; - return r; - } - - return 1; -} - -static int manager_inhibit_timeout_handler( - sd_event_source *s, - uint64_t usec, - void *userdata) { - - Manager *manager = userdata; - int r; - - assert(manager); - assert(manager->inhibit_timeout_source == s); - - r = manager_dispatch_delayed(manager, true); - return (r < 0) ? r : 0; -} - static int delay_shutdown_or_sleep( Manager *m, InhibitWhat w, const char *unit_name) { - int r; - usec_t timeout_val; - assert(m); assert(w >= 0); assert(w < _INHIBIT_WHAT_MAX); assert(unit_name); - timeout_val = now(CLOCK_MONOTONIC) + m->inhibit_delay_max; - - if (m->inhibit_timeout_source) { - r = sd_event_source_set_time(m->inhibit_timeout_source, timeout_val); - if (r < 0) - return log_error_errno(r, "sd_event_source_set_time() failed: %m"); - - r = sd_event_source_set_enabled(m->inhibit_timeout_source, SD_EVENT_ONESHOT); - if (r < 0) - return log_error_errno(r, "sd_event_source_set_enabled() failed: %m"); - } else { - r = sd_event_add_time(m->event, &m->inhibit_timeout_source, CLOCK_MONOTONIC, - timeout_val, 0, manager_inhibit_timeout_handler, m); - if (r < 0) - return r; - } - + m->action_timestamp = now(CLOCK_MONOTONIC); m->action_unit = unit_name; m->action_what = w; @@ -1621,25 +1537,49 @@ int bus_manager_shutdown_or_sleep_now_or_later( return r; } -static int verify_shutdown_creds( +static int method_do_shutdown_or_sleep( Manager *m, sd_bus_message *message, + const char *unit_name, InhibitWhat w, - bool interactive, const char *action, const char *action_multiple_sessions, const char *action_ignore_inhibit, + const char *sleep_verb, + sd_bus_message_handler_t method, sd_bus_error *error) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; bool multiple_sessions, blocked; + int interactive, r; uid_t uid; - int r; assert(m); assert(message); + assert(unit_name); assert(w >= 0); assert(w <= _INHIBIT_WHAT_MAX); + assert(action); + assert(action_multiple_sessions); + assert(action_ignore_inhibit); + assert(method); + + r = sd_bus_message_read(message, "b", &interactive); + if (r < 0) + return r; + + /* Don't allow multiple jobs being executed at the same time */ + if (m->action_what) + return sd_bus_error_setf(error, BUS_ERROR_OPERATION_IN_PROGRESS, "There's already a shutdown or sleep operation in progress"); + + if (sleep_verb) { + r = can_sleep(sleep_verb); + if (r < 0) + return r; + + if (r == 0) + return sd_bus_error_setf(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED, "Sleep verb not supported"); + } r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_EUID, &creds); if (r < 0) @@ -1656,7 +1596,7 @@ static int verify_shutdown_creds( multiple_sessions = r > 0; blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL); - if (multiple_sessions && action_multiple_sessions) { + if (multiple_sessions) { r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action_multiple_sessions, interactive, UID_INVALID, &m->polkit_registry, error); if (r < 0) return r; @@ -1664,7 +1604,7 @@ static int verify_shutdown_creds( return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ } - if (blocked && action_ignore_inhibit) { + if (blocked) { r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action_ignore_inhibit, interactive, UID_INVALID, &m->polkit_registry, error); if (r < 0) return r; @@ -1672,7 +1612,7 @@ static int verify_shutdown_creds( return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ } - if (!multiple_sessions && !blocked && action) { + if (!multiple_sessions && !blocked) { r = bus_verify_polkit_async(message, CAP_SYS_BOOT, action, interactive, UID_INVALID, &m->polkit_registry, error); if (r < 0) return r; @@ -1680,50 +1620,6 @@ static int verify_shutdown_creds( return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ } - return 0; -} - -static int method_do_shutdown_or_sleep( - Manager *m, - sd_bus_message *message, - const char *unit_name, - InhibitWhat w, - const char *action, - const char *action_multiple_sessions, - const char *action_ignore_inhibit, - const char *sleep_verb, - sd_bus_error *error) { - - int interactive, r; - - assert(m); - assert(message); - assert(unit_name); - assert(w >= 0); - assert(w <= _INHIBIT_WHAT_MAX); - - r = sd_bus_message_read(message, "b", &interactive); - if (r < 0) - return r; - - /* Don't allow multiple jobs being executed at the same time */ - if (m->action_what) - return sd_bus_error_setf(error, BUS_ERROR_OPERATION_IN_PROGRESS, "There's already a shutdown or sleep operation in progress"); - - if (sleep_verb) { - r = can_sleep(sleep_verb); - if (r < 0) - return r; - - if (r == 0) - return sd_bus_error_setf(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED, "Sleep verb not supported"); - } - - r = verify_shutdown_creds(m, message, w, interactive, action, action_multiple_sessions, - action_ignore_inhibit, error); - if (r != 0) - return r; - r = bus_manager_shutdown_or_sleep_now_or_later(m, unit_name, w, error); if (r < 0) return r; @@ -1731,7 +1627,7 @@ static int method_do_shutdown_or_sleep( return sd_bus_reply_method_return(message, NULL); } -static int method_poweroff(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_poweroff(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_do_shutdown_or_sleep( @@ -1742,10 +1638,11 @@ static int method_poweroff(sd_bus_message *message, void *userdata, sd_bus_error "org.freedesktop.login1.power-off-multiple-sessions", "org.freedesktop.login1.power-off-ignore-inhibit", NULL, + method_poweroff, error); } -static int method_reboot(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_reboot(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_do_shutdown_or_sleep( @@ -1756,10 +1653,11 @@ static int method_reboot(sd_bus_message *message, void *userdata, sd_bus_error * "org.freedesktop.login1.reboot-multiple-sessions", "org.freedesktop.login1.reboot-ignore-inhibit", NULL, + method_reboot, error); } -static int method_suspend(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_suspend(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_do_shutdown_or_sleep( @@ -1770,247 +1668,11 @@ static int method_suspend(sd_bus_message *message, void *userdata, sd_bus_error "org.freedesktop.login1.suspend-multiple-sessions", "org.freedesktop.login1.suspend-ignore-inhibit", "suspend", + method_suspend, error); } -static int nologin_timeout_handler( - sd_event_source *s, - uint64_t usec, - void *userdata) { - - Manager *m = userdata; - int r; - - log_info("Creating /run/nologin, blocking further logins..."); - - r = write_string_file("/run/nologin", "System is going down.", WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC); - if (r < 0) - log_error_errno(r, "Failed to create /run/nologin: %m"); - else - m->unlink_nologin = true; - - return 0; -} - -static int update_schedule_file(Manager *m) { - - int r; - _cleanup_fclose_ FILE *f = NULL; - _cleanup_free_ char *t = NULL, *temp_path = NULL; - - assert(m); - - r = mkdir_safe_label("/run/systemd/shutdown", 0755, 0, 0); - if (r < 0) - return log_error_errno(r, "Failed to create shutdown subdirectory: %m"); - - t = cescape(m->wall_message); - if (!t) - return log_oom(); - - r = fopen_temporary("/run/systemd/shutdown/scheduled", &f, &temp_path); - if (r < 0) - return log_error_errno(r, "Failed to save information about scheduled shutdowns: %m"); - - (void) fchmod(fileno(f), 0644); - - fprintf(f, - "USEC="USEC_FMT"\n" - "WARN_WALL=%i\n" - "MODE=%s\n", - m->scheduled_shutdown_timeout, - m->enable_wall_messages, - m->scheduled_shutdown_type); - - if (!isempty(m->wall_message)) - fprintf(f, "WALL_MESSAGE=%s\n", t); - - (void) fflush_and_check(f); - - if (ferror(f) || rename(temp_path, "/run/systemd/shutdown/scheduled") < 0) { - log_error_errno(errno, "Failed to write information about scheduled shutdowns: %m"); - r = -errno; - - (void) unlink(temp_path); - (void) unlink("/run/systemd/shutdown/scheduled"); - } - - return r; -} - -static int manager_scheduled_shutdown_handler( - sd_event_source *s, - uint64_t usec, - void *userdata) { - - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - Manager *m = userdata; - const char *target; - int r; - - assert(m); - - if (isempty(m->scheduled_shutdown_type)) - return 0; - - if (streq(m->scheduled_shutdown_type, "halt")) - target = SPECIAL_HALT_TARGET; - else if (streq(m->scheduled_shutdown_type, "poweroff")) - target = SPECIAL_POWEROFF_TARGET; - else - target = SPECIAL_REBOOT_TARGET; - - r = execute_shutdown_or_sleep(m, 0, target, &error); - if (r < 0) - return log_error_errno(r, "Unable to execute transition to %s: %m", target); - - return 0; -} - -static int method_schedule_shutdown(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Manager *m = userdata; - _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; - const char *action_multiple_sessions = NULL; - const char *action_ignore_inhibit = NULL; - const char *action = NULL; - uint64_t elapse; - char *type; - int r; - - assert(m); - assert(message); - - r = sd_bus_message_read(message, "st", &type, &elapse); - if (r < 0) - return r; - - if (streq(type, "reboot")) { - action = "org.freedesktop.login1.reboot"; - action_multiple_sessions = "org.freedesktop.login1.reboot-multiple-sessions"; - action_ignore_inhibit = "org.freedesktop.login1.reboot-ignore-inhibit"; - } else if (streq(type, "halt")) { - action = "org.freedesktop.login1.halt"; - action_multiple_sessions = "org.freedesktop.login1.halt-multiple-sessions"; - action_ignore_inhibit = "org.freedesktop.login1.halt-ignore-inhibit"; - } else if (streq(type, "poweroff")) { - action = "org.freedesktop.login1.poweroff"; - action_multiple_sessions = "org.freedesktop.login1.poweroff-multiple-sessions"; - action_ignore_inhibit = "org.freedesktop.login1.poweroff-ignore-inhibit"; - } else - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unsupported shutdown type"); - - r = verify_shutdown_creds(m, message, INHIBIT_SHUTDOWN, false, - action, action_multiple_sessions, action_ignore_inhibit, error); - if (r != 0) - return r; - - if (m->scheduled_shutdown_timeout_source) { - r = sd_event_source_set_time(m->scheduled_shutdown_timeout_source, elapse); - if (r < 0) - return log_error_errno(r, "sd_event_source_set_time() failed: %m"); - - r = sd_event_source_set_enabled(m->scheduled_shutdown_timeout_source, SD_EVENT_ONESHOT); - if (r < 0) - return log_error_errno(r, "sd_event_source_set_enabled() failed: %m"); - } else { - r = sd_event_add_time(m->event, &m->scheduled_shutdown_timeout_source, - CLOCK_REALTIME, elapse, 0, manager_scheduled_shutdown_handler, m); - if (r < 0) - return log_error_errno(r, "sd_event_add_time() failed: %m"); - } - - r = free_and_strdup(&m->scheduled_shutdown_type, type); - if (r < 0) { - m->scheduled_shutdown_timeout_source = sd_event_source_unref(m->scheduled_shutdown_timeout_source); - return log_oom(); - } - - if (m->nologin_timeout_source) { - r = sd_event_source_set_time(m->nologin_timeout_source, elapse); - if (r < 0) - return log_error_errno(r, "sd_event_source_set_time() failed: %m"); - - r = sd_event_source_set_enabled(m->nologin_timeout_source, SD_EVENT_ONESHOT); - if (r < 0) - return log_error_errno(r, "sd_event_source_set_enabled() failed: %m"); - } else { - r = sd_event_add_time(m->event, &m->nologin_timeout_source, - CLOCK_REALTIME, elapse - 5 * USEC_PER_MINUTE, 0, nologin_timeout_handler, m); - if (r < 0) - return log_error_errno(r, "sd_event_add_time() failed: %m"); - } - - m->scheduled_shutdown_timeout = elapse; - - r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_AUGMENT|SD_BUS_CREDS_TTY|SD_BUS_CREDS_UID, &creds); - if (r >= 0) { - const char *tty; - - (void) sd_bus_creds_get_uid(creds, &m->scheduled_shutdown_uid); - (void) sd_bus_creds_get_tty(creds, &tty); - - r = free_and_strdup(&m->scheduled_shutdown_tty, tty); - if (r < 0) { - m->scheduled_shutdown_timeout_source = sd_event_source_unref(m->scheduled_shutdown_timeout_source); - return log_oom(); - } - } - - r = manager_setup_wall_message_timer(m); - if (r < 0) - return r; - - if (!isempty(type)) { - r = update_schedule_file(m); - if (r < 0) - return r; - } else - (void) unlink("/run/systemd/shutdown/scheduled"); - - return sd_bus_reply_method_return(message, NULL); -} - -static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userdata, sd_bus_error *error) { - Manager *m = userdata; - bool cancelled; - - assert(m); - assert(message); - - cancelled = m->scheduled_shutdown_type != NULL; - - m->scheduled_shutdown_timeout_source = sd_event_source_unref(m->scheduled_shutdown_timeout_source); - m->wall_message_timeout_source = sd_event_source_unref(m->wall_message_timeout_source); - m->nologin_timeout_source = sd_event_source_unref(m->nologin_timeout_source); - free(m->scheduled_shutdown_type); - m->scheduled_shutdown_type = NULL; - m->scheduled_shutdown_timeout = 0; - - if (m->unlink_nologin) { - (void) unlink("/run/nologin"); - m->unlink_nologin = false; - } - - if (cancelled) { - _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; - const char *tty = NULL; - uid_t uid = 0; - int r; - - r = sd_bus_query_sender_creds(message, SD_BUS_CREDS_AUGMENT|SD_BUS_CREDS_TTY|SD_BUS_CREDS_UID, &creds); - if (r >= 0) { - (void) sd_bus_creds_get_uid(creds, &uid); - (void) sd_bus_creds_get_tty(creds, &tty); - } - - utmp_wall("The system shutdown has been cancelled", - lookup_uid(uid), tty, logind_wall_tty_filter, m); - } - - return sd_bus_reply_method_return(message, "b", cancelled); -} - -static int method_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_hibernate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_do_shutdown_or_sleep( @@ -2021,10 +1683,11 @@ static int method_hibernate(sd_bus_message *message, void *userdata, sd_bus_erro "org.freedesktop.login1.hibernate-multiple-sessions", "org.freedesktop.login1.hibernate-ignore-inhibit", "hibernate", + method_hibernate, error); } -static int method_hybrid_sleep(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_hybrid_sleep(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_do_shutdown_or_sleep( @@ -2035,6 +1698,7 @@ static int method_hybrid_sleep(sd_bus_message *message, void *userdata, sd_bus_e "org.freedesktop.login1.hibernate-multiple-sessions", "org.freedesktop.login1.hibernate-ignore-inhibit", "hybrid-sleep", + method_hybrid_sleep, error); } @@ -2086,7 +1750,7 @@ static int method_can_shutdown_or_sleep( blocked = manager_is_inhibited(m, w, INHIBIT_BLOCK, NULL, false, true, uid, NULL); if (multiple_sessions) { - r = bus_test_polkit(message, CAP_SYS_BOOT, action_multiple_sessions, UID_INVALID, &challenge, error); + r = bus_verify_polkit(message, CAP_SYS_BOOT, action_multiple_sessions, false, UID_INVALID, &challenge, error); if (r < 0) return r; @@ -2099,7 +1763,7 @@ static int method_can_shutdown_or_sleep( } if (blocked) { - r = bus_test_polkit(message, CAP_SYS_BOOT, action_ignore_inhibit, UID_INVALID, &challenge, error); + r = bus_verify_polkit(message, CAP_SYS_BOOT, action_ignore_inhibit, false, UID_INVALID, &challenge, error); if (r < 0) return r; @@ -2115,7 +1779,7 @@ static int method_can_shutdown_or_sleep( /* If neither inhibit nor multiple sessions * apply then just check the normal policy */ - r = bus_test_polkit(message, CAP_SYS_BOOT, action, UID_INVALID, &challenge, error); + r = bus_verify_polkit(message, CAP_SYS_BOOT, action, false, UID_INVALID, &challenge, error); if (r < 0) return r; @@ -2130,7 +1794,7 @@ static int method_can_shutdown_or_sleep( return sd_bus_reply_method_return(message, "s", result); } -static int method_can_poweroff(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_can_poweroff(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_can_shutdown_or_sleep( @@ -2143,7 +1807,7 @@ static int method_can_poweroff(sd_bus_message *message, void *userdata, sd_bus_e error); } -static int method_can_reboot(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_can_reboot(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_can_shutdown_or_sleep( @@ -2156,7 +1820,7 @@ static int method_can_reboot(sd_bus_message *message, void *userdata, sd_bus_err error); } -static int method_can_suspend(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_can_suspend(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_can_shutdown_or_sleep( @@ -2169,7 +1833,7 @@ static int method_can_suspend(sd_bus_message *message, void *userdata, sd_bus_er error); } -static int method_can_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_can_hibernate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_can_shutdown_or_sleep( @@ -2182,7 +1846,7 @@ static int method_can_hibernate(sd_bus_message *message, void *userdata, sd_bus_ error); } -static int method_can_hybrid_sleep(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_can_hybrid_sleep(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; return method_can_shutdown_or_sleep( @@ -2195,100 +1859,7 @@ static int method_can_hybrid_sleep(sd_bus_message *message, void *userdata, sd_b error); } -static int property_get_reboot_to_firmware_setup( - sd_bus *bus, - const char *path, - const char *interface, - const char *property, - sd_bus_message *reply, - void *userdata, - sd_bus_error *error) { - int r; - - assert(bus); - assert(reply); - assert(userdata); - - r = efi_get_reboot_to_firmware(); - if (r < 0 && r != -EOPNOTSUPP) - return r; - - return sd_bus_message_append(reply, "b", r > 0); -} - -static int method_set_reboot_to_firmware_setup( - sd_bus_message *message, - void *userdata, - sd_bus_error *error) { - - int b, r; - Manager *m = userdata; - - assert(message); - assert(m); - - r = sd_bus_message_read(message, "b", &b); - if (r < 0) - return r; - - r = bus_verify_polkit_async(message, - CAP_SYS_ADMIN, - "org.freedesktop.login1.set-reboot-to-firmware-setup", - false, - UID_INVALID, - &m->polkit_registry, - error); - if (r < 0) - return r; - if (r == 0) - return 1; /* No authorization for now, but the async polkit stuff will call us again when it has it */ - - r = efi_set_reboot_to_firmware(b); - if (r < 0) - return r; - - return sd_bus_reply_method_return(message, NULL); -} - -static int method_can_reboot_to_firmware_setup( - sd_bus_message *message, - void *userdata, - sd_bus_error *error) { - - int r; - bool challenge; - const char *result; - Manager *m = userdata; - - assert(message); - assert(m); - - r = efi_reboot_to_firmware_supported(); - if (r == -EOPNOTSUPP) - return sd_bus_reply_method_return(message, "s", "na"); - else if (r < 0) - return r; - - r = bus_test_polkit(message, - CAP_SYS_ADMIN, - "org.freedesktop.login1.set-reboot-to-firmware-setup", - UID_INVALID, - &challenge, - error); - if (r < 0) - return r; - - if (r > 0) - result = "yes"; - else if (challenge) - result = "challenge"; - else - result = "no"; - - return sd_bus_reply_method_return(message, "s", result); -} - -static int method_inhibit(sd_bus_message *message, void *userdata, sd_bus_error *error) { +static int method_inhibit(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL; const char *who, *why, *what, *mode; _cleanup_free_ char *id = NULL; @@ -2301,6 +1872,7 @@ static int method_inhibit(sd_bus_message *message, void *userdata, sd_bus_error uid_t uid; int r; + assert(bus); assert(message); assert(m); @@ -2403,14 +1975,9 @@ fail: const sd_bus_vtable manager_vtable[] = { SD_BUS_VTABLE_START(0), - SD_BUS_WRITABLE_PROPERTY("EnableWallMessages", "b", NULL, NULL, offsetof(Manager, enable_wall_messages), 0), - SD_BUS_WRITABLE_PROPERTY("WallMessage", "s", NULL, NULL, offsetof(Manager, wall_message), 0), - - SD_BUS_PROPERTY("NAutoVTs", "u", NULL, offsetof(Manager, n_autovts), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("KillOnlyUsers", "as", NULL, offsetof(Manager, kill_only_users), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("KillExcludeUsers", "as", NULL, offsetof(Manager, kill_exclude_users), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("KillUserProcesses", "b", NULL, offsetof(Manager, kill_user_processes), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_PROPERTY("RebootToFirmwareSetup", "b", property_get_reboot_to_firmware_setup, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("IdleHint", "b", property_get_idle_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("IdleSinceHint", "t", property_get_idle_since_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("IdleSinceHintMonotonic", "t", property_get_idle_since_hint, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), @@ -2427,8 +1994,6 @@ const sd_bus_vtable manager_vtable[] = { SD_BUS_PROPERTY("IdleActionUSec", "t", NULL, offsetof(Manager, idle_action_usec), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("PreparingForShutdown", "b", property_get_preparing, 0, 0), SD_BUS_PROPERTY("PreparingForSleep", "b", property_get_preparing, 0, 0), - SD_BUS_PROPERTY("ScheduledShutdown", "(st)", property_get_scheduled_shutdown, 0, 0), - SD_BUS_PROPERTY("Docked", "b", property_get_docked, 0, 0), SD_BUS_METHOD("GetSession", "s", "o", method_get_session, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("GetSessionByPID", "u", "o", method_get_session_by_pid, SD_BUS_VTABLE_UNPRIVILEGED), @@ -2465,11 +2030,7 @@ const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD("CanSuspend", NULL, "s", method_can_suspend, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("CanHibernate", NULL, "s", method_can_hibernate, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("CanHybridSleep", NULL, "s", method_can_hybrid_sleep, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("ScheduleShutdown", "st", NULL, method_schedule_shutdown, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("CancelScheduledShutdown", NULL, "b", method_cancel_scheduled_shutdown, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("Inhibit", "ssss", "h", method_inhibit, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("CanRebootToFirmwareSetup", NULL, "s", method_can_reboot_to_firmware_setup, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("SetRebootToFirmwareSetup", "b", NULL, method_set_reboot_to_firmware_setup, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_SIGNAL("SessionNew", "so", 0), SD_BUS_SIGNAL("SessionRemoved", "so", 0), @@ -2504,7 +2065,7 @@ static int session_jobs_reply(Session *s, const char *unit, const char *result) return r; } -int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error) { +int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { const char *path, *result, *unit; Manager *m = userdata; Session *session; @@ -2512,6 +2073,7 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err User *user; int r; + assert(bus); assert(message); assert(m); @@ -2545,7 +2107,6 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err session_jobs_reply(session, unit, result); session_save(session); - user_save(session->user); session_add_to_gc_queue(session); } @@ -2573,13 +2134,14 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err return 0; } -int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error) { +int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { const char *path, *unit; Manager *m = userdata; Session *session; User *user; int r; + assert(bus); assert(message); assert(m); @@ -2600,7 +2162,7 @@ int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *er return 0; } -int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error) { +int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *unit = NULL; Manager *m = userdata; const char *path; @@ -2608,6 +2170,7 @@ int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_err User *user; int r; + assert(bus); assert(message); assert(m); @@ -2632,14 +2195,13 @@ int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_err return 0; } -int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error) { +int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { Manager *m = userdata; Session *session; Iterator i; int b, r; - assert(message); - assert(m); + assert(bus); r = sd_bus_message_read(message, "b", &b); if (r < 0) { @@ -2659,16 +2221,15 @@ int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error return 0; } -int match_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error) { +int match_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { const char *name, *old, *new; Manager *m = userdata; Session *session; Iterator i; int r; - char *key; - assert(message); - assert(m); + + char *key; r = sd_bus_message_read(message, "sss", &name, &old, &new); if (r < 0) { @@ -2708,6 +2269,44 @@ int manager_send_changed(Manager *manager, const char *property, ...) { l); } +int manager_dispatch_delayed(Manager *manager) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + Inhibitor *offending = NULL; + int r; + + assert(manager); + + if (manager->action_what == 0 || manager->action_job) + return 0; + + /* Continue delay? */ + if (manager_is_inhibited(manager, manager->action_what, INHIBIT_DELAY, NULL, false, false, 0, &offending)) { + _cleanup_free_ char *comm = NULL, *u = NULL; + + get_process_comm(offending->pid, &comm); + u = uid_to_name(offending->uid); + + if (manager->action_timestamp + manager->inhibit_delay_max > now(CLOCK_MONOTONIC)) + return 0; + + log_info("Delay lock is active (UID "UID_FMT"/%s, PID "PID_FMT"/%s) but inhibitor timeout is reached.", + offending->uid, strna(u), + offending->pid, strna(comm)); + } + + /* Actually do the operation */ + r = execute_shutdown_or_sleep(manager, manager->action_what, manager->action_unit, &error); + if (r < 0) { + log_warning("Failed to send delayed message: %s", bus_error_message(&error, r)); + + manager->action_unit = NULL; + manager->action_what = 0; + return r; + } + + return 1; +} + int manager_start_scope( Manager *manager, const char *scope, diff --git a/src/login/logind.c b/src/login/logind.c index f84938a7f..c3e7acbec 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -46,10 +46,7 @@ static Manager *manager_new(void) { return NULL; m->console_active_fd = -1; - m->reserve_vt_fd = -1; - m->n_autovts = 6; - m->reserve_vt = 6; m->remove_ipc = true; m->inhibit_delay_max = 5 * USEC_PER_SEC; m->handle_power_key = HANDLE_POWEROFF; @@ -178,8 +175,6 @@ static void manager_free(Manager *m) { sd_bus_unref(m->bus); sd_event_unref(m->event); - safe_close(m->reserve_vt_fd); - strv_free(m->kill_only_users); strv_free(m->kill_exclude_users); @@ -564,29 +559,6 @@ static int manager_dispatch_console(sd_event_source *s, int fd, uint32_t revents return 0; } -static int manager_reserve_vt(Manager *m) { - _cleanup_free_ char *p = NULL; - - assert(m); - - if (m->reserve_vt <= 0) - return 0; - - if (asprintf(&p, "/dev/tty%u", m->reserve_vt) < 0) - return log_oom(); - - m->reserve_vt_fd = open(p, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK); - if (m->reserve_vt_fd < 0) { - - /* Don't complain on VT-less systems */ - if (errno != ENOENT) - log_warning_errno(errno, "Failed to pin reserved VT: %m"); - return -errno; - } - - return 0; -} - static int manager_connect_bus(Manager *m) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; int r; @@ -874,26 +846,6 @@ static int manager_connect_udev(Manager *m) { return r; } - /* Don't bother watching VCSA devices, if nobody cares */ - if (m->n_autovts > 0 && m->console_active_fd >= 0) { - - m->udev_vcsa_monitor = udev_monitor_new_from_netlink(m->udev, "udev"); - if (!m->udev_vcsa_monitor) - return -ENOMEM; - - r = udev_monitor_filter_add_match_subsystem_devtype(m->udev_vcsa_monitor, "vc", NULL); - if (r < 0) - return r; - - r = udev_monitor_enable_receiving(m->udev_vcsa_monitor); - if (r < 0) - return r; - - r = sd_event_add_io(m->event, &m->udev_vcsa_event_source, udev_monitor_get_fd(m->udev_vcsa_monitor), EPOLLIN, manager_dispatch_vcsa_udev, m); - if (r < 0) - return r; - } - return 0; } @@ -1071,9 +1023,6 @@ static int manager_startup(Manager *m) { /* Remove stale objects before we start them */ manager_gc(m, false); - /* Reserve the special reserved VT */ - manager_reserve_vt(m); - /* And start everything */ HASHMAP_FOREACH(seat, m->seats, i) seat_start(seat); diff --git a/src/login/logind.h b/src/login/logind.h index ad437b72c..20c4180de 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -65,11 +65,6 @@ struct Manager { int console_active_fd; - unsigned n_autovts; - - unsigned reserve_vt; - int reserve_vt_fd; - Seat *seat0; char **kill_only_users, **kill_exclude_users; @@ -95,19 +90,7 @@ struct Manager { /* If a shutdown/suspend is currently executed, then this is * the job of it */ char *action_job; - sd_event_source *inhibit_timeout_source; - - char *scheduled_shutdown_type; - usec_t scheduled_shutdown_timeout; - sd_event_source *scheduled_shutdown_timeout_source; - uid_t scheduled_shutdown_uid; - char *scheduled_shutdown_tty; - sd_event_source *nologin_timeout_source; - bool unlink_nologin; - - char *wall_message; - unsigned enable_wall_messages; - sd_event_source *wall_message_timeout_source; + usec_t action_timestamp; sd_event_source *idle_action_event_source; usec_t idle_action_usec; @@ -135,6 +118,9 @@ struct Manager { size_t runtime_dir_size; }; +Manager *manager_new(void); +void manager_free(Manager *m); + int manager_add_device(Manager *m, const char *sysfs, bool master, Device **_device); int manager_add_button(Manager *m, const char *name, Button **_button); int manager_add_seat(Manager *m, const char *id, Seat **_seat); @@ -147,7 +133,10 @@ int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor); int manager_process_seat_device(Manager *m, struct udev_device *d); int manager_process_button_device(Manager *m, struct udev_device *d); -int manager_spawn_autovt(Manager *m, unsigned int vtnr); +int manager_startup(Manager *m); +int manager_run(Manager *m); + +void manager_gc(Manager *m, bool drop_not_started); bool manager_shall_kill(Manager *m, const char *user); @@ -160,16 +149,18 @@ bool manager_is_docked_or_external_displays(Manager *m); extern const sd_bus_vtable manager_vtable[]; -int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); -int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); -int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); -int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error); -int match_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_name_owner_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit_name, InhibitWhat w, sd_bus_error *error); int manager_send_changed(Manager *manager, const char *property, ...) _sentinel_; +int manager_dispatch_delayed(Manager *manager); + int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, sd_bus_error *error, char **job); int manager_start_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); @@ -192,7 +183,5 @@ int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const ch int manager_get_user_from_creds(Manager *m, sd_bus_message *message, uid_t uid, sd_bus_error *error, User **ret); int manager_get_seat_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Seat **ret); -int manager_setup_wall_message_timer(Manager *m); -bool logind_wall_tty_filter(const char *tty, void *userdata); -int manager_dispatch_delayed(Manager *manager, bool timeout); +int manager_dispatch_delayed(Manager *manager, bool timeout); \ No newline at end of file