X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Flogin%2Flogind.c;h=792a04dc0811c8087ee6f3e019e5492dd6a97627;hb=b514d6c9dcc7c0d7353f975ecfb94f2197c73cf1;hp=59ee2e6d44582906564e7752fa22b6e2f6765b0b;hpb=46158d1ab9f793290b418e2345a417316aa1f64c;p=elogind.git diff --git a/src/login/logind.c b/src/login/logind.c index 59ee2e6d4..792a04dc0 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -32,8 +32,13 @@ #include "bus-error.h" #include "logind.h" #include "udev-util.h" +#include "formats-util.h" +#include "label.h" +#include "label.h" -Manager *manager_new(void) { +static void manager_free(Manager *m); + +static Manager *manager_new(void) { Manager *m; int r; @@ -72,10 +77,7 @@ Manager *manager_new(void) { m->user_units = hashmap_new(&string_hash_ops); m->session_units = hashmap_new(&string_hash_ops); - m->busnames = set_new(&string_hash_ops); - - if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->busnames || - !m->user_units || !m->session_units) + if (!m->devices || !m->seats || !m->sessions || !m->users || !m->inhibitors || !m->buttons || !m->user_units || !m->session_units) goto fail; m->kill_exclude_users = strv_new("root", NULL); @@ -99,7 +101,7 @@ fail: return NULL; } -void manager_free(Manager *m) { +static void manager_free(Manager *m) { Session *session; User *u; Device *d; @@ -137,9 +139,11 @@ void manager_free(Manager *m) { hashmap_free(m->user_units); hashmap_free(m->session_units); - set_free_free(m->busnames); - sd_event_source_unref(m->idle_action_event_source); + sd_event_source_unref(m->inhibit_timeout_source); + sd_event_source_unref(m->scheduled_shutdown_timeout_source); + sd_event_source_unref(m->nologin_timeout_source); + sd_event_source_unref(m->wall_message_timeout_source); sd_event_source_unref(m->console_active_event_source); sd_event_source_unref(m->udev_seat_event_source); @@ -150,18 +154,16 @@ void manager_free(Manager *m) { safe_close(m->console_active_fd); - if (m->udev_seat_monitor) udev_monitor_unref(m->udev_seat_monitor); - if (m->udev_device_monitor) udev_monitor_unref(m->udev_device_monitor); - if (m->udev_vcsa_monitor) udev_monitor_unref(m->udev_vcsa_monitor); - if (m->udev_button_monitor) udev_monitor_unref(m->udev_button_monitor); - if (m->udev) udev_unref(m->udev); + if (m->unlink_nologin) + unlink("/run/nologin"); + bus_verify_polkit_async_registry_free(m->polkit_registry); sd_bus_unref(m->bus); @@ -172,6 +174,9 @@ void manager_free(Manager *m) { strv_free(m->kill_only_users); strv_free(m->kill_exclude_users); + free(m->scheduled_shutdown_type); + free(m->scheduled_shutdown_tty); + free(m->wall_message); free(m->action_job); free(m); } @@ -612,17 +617,6 @@ static int manager_connect_bus(Manager *m) { if (r < 0) return log_error_errno(r, "Failed to add user enumerator: %m"); - r = sd_bus_add_match(m->bus, - NULL, - "type='signal'," - "sender='org.freedesktop.DBus'," - "interface='org.freedesktop.DBus'," - "member='NameOwnerChanged'," - "path='/org/freedesktop/DBus'", - match_name_owner_changed, m); - if (r < 0) - return log_error_errno(r, "Failed to add match for NameOwnerChanged: %m"); - r = sd_bus_add_match(m->bus, NULL, "type='signal'," @@ -665,7 +659,7 @@ static int manager_connect_bus(Manager *m) { match_reloading, m); if (r < 0) return log_error_errno(r, "Failed to add match for Reloading: %m"); - +#if 0 r = sd_bus_call_method( m->bus, "org.freedesktop.systemd1", @@ -675,10 +669,10 @@ static int manager_connect_bus(Manager *m) { &error, NULL, NULL); if (r < 0) { - log_warning("Failed to subscribe to org.freedesktop.systemd1.Manager: %s", - bus_error_message(&error, r)); + log_error("Failed to enable subscription: %s", bus_error_message(&error, r)); + return r; } - +#endif // 0 r = sd_bus_request_name(m->bus, "org.freedesktop.login1", 0); if (r < 0) return log_error_errno(r, "Failed to register name: %m"); @@ -888,7 +882,7 @@ static int manager_connect_udev(Manager *m) { return 0; } -void manager_gc(Manager *m, bool drop_not_started) { +static void manager_gc(Manager *m, bool drop_not_started) { Seat *seat; Session *session; User *user; @@ -914,8 +908,8 @@ void manager_gc(Manager *m, bool drop_not_started) { session_get_state(session) != SESSION_CLOSING) session_stop(session, false); - /* Normally, this should make the session busy again, - * if it doesn't then let's get rid of it + /* Normally, this should make the session referenced + * again, if it doesn't then let's get rid of it * immediately */ if (!session_check_gc(session, drop_not_started)) { session_finalize(session); @@ -999,7 +993,7 @@ static int manager_dispatch_idle_action(sd_event_source *s, uint64_t t, void *us return 0; } -int manager_startup(Manager *m) { +static int manager_startup(Manager *m) { int r; Seat *seat; Session *session; @@ -1086,14 +1080,12 @@ int manager_startup(Manager *m) { return 0; } -int manager_run(Manager *m) { +static int manager_run(Manager *m) { int r; assert(m); for (;;) { - usec_t us = (uint64_t) -1; - r = sd_event_get_state(m->event); if (r < 0) return r; @@ -1102,19 +1094,7 @@ int manager_run(Manager *m) { manager_gc(m, true); - if (manager_dispatch_delayed(m) > 0) - continue; - - if (m->action_what != 0 && !m->action_job) { - usec_t x, y; - - x = now(CLOCK_MONOTONIC); - y = m->action_timestamp + m->inhibit_delay_max; - - us = x >= y ? 0 : y - x; - } - - r = sd_event_run(m->event, us); + r = sd_event_run(m->event, (uint64_t) -1); if (r < 0) return r; } @@ -1185,7 +1165,6 @@ finish: "STOPPING=1\n" "STATUS=Shutting down..."); - if (m) manager_free(m); return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;