Prep v220: elogind does not need to register with systemd1.*

[elogind.git] / src / login / logind.c

diff --git a/src/login/logind.c b/src/login/logind.c
index 3a4afdd266b8d65a698c7e6d3cb9fb806ff0ff43..73ba53d5b3270777217573ee7782f92eed9adabe 100644 (file)
--- 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);
 
@@ -145,6 +146,8 @@ static void manager_free(Manager *m) {
         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);
@@ -167,6 +170,9 @@ static void manager_free(Manager *m) {
         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 +184,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);
 }
@@ -629,7 +637,7 @@ static int manager_connect_bus(Manager *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to add match for NameOwnerChanged: %m");
 
-        r = sd_bus_add_match(m->bus,
+       r = sd_bus_add_match(m->bus,
                              NULL,
                              "type='signal',"
                              "sender='org.freedesktop.systemd1',"
@@ -671,7 +679,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 +692,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");