X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind.c;h=6cc6218b3de851df3aa715ed6166502a30bbe9f5;hb=1308667689580277d99a7fcdf8769752986d31eb;hp=3a4afdd266b8d65a698c7e6d3cb9fb806ff0ff43;hpb=edda707302d7c5138291c0ff4e9c43db9fba51d8;p=elogind.git

diff --git a/src/login/logind.c b/src/login/logind.c
index 3a4afdd26..6cc6218b3 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -33,6 +33,7 @@
 #include "logind.h"
 #include "udev-util.h"
 #include "formats-util.h"
+#include "label.h"
 
 static void manager_free(Manager *m);
 
@@ -75,10 +76,7 @@ static 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);
@@ -140,11 +138,11 @@ static 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);
@@ -155,18 +153,16 @@ static 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);
@@ -178,6 +174,8 @@ static void manager_free(Manager *m) {
         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);
 }
@@ -618,17 +616,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',"
@@ -671,7 +658,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",
@@ -684,7 +671,7 @@ static int manager_connect_bus(Manager *m) {
                 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");
@@ -920,8 +907,8 @@ static 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);
@@ -1177,7 +1164,6 @@ finish:
                   "STOPPING=1\n"
                   "STATUS=Shutting down...");
 
-        if (m)
                 manager_free(m);
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;