v235: Added missing updates

4 files changed, 10 insertions, 9 deletions

diff --git a/src/login/elogind.c b/src/login/elogind.c
index 96cb7bd41..d6f2eaef4 100644
--- a/src/login/elogind.c
+++ b/src/login/elogind.c
@@ -243,7 +243,7 @@ int elogind_setup_cgroups_agent(Manager *m) {
          * to it. The system instance hence listens on this special socket, but the user instances listen on the system
          * bus for these messages. */
 
-        if (m->test_run)
+        if (m->test_run_flags)
                 return 0;
 
         if (!MANAGER_IS_SYSTEM(m))
@@ -382,7 +382,7 @@ int elogind_manager_new(Manager* m) {
 
         m->cgroups_agent_fd = -1;
         m->pin_cgroupfs_fd  = -1;
-        m->test_run         = false;
+        m->test_run_flags   = 0;
 
         /* Init sleep modes and states */
         m->suspend_mode       = NULL;
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index e80b778cf..63cd1a4d4 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1497,8 +1497,11 @@ int manager_set_lid_switch_ignore(Manager *m, usec_t until) {
         return r;
 }
 
-#if 0 /// elogind has its own variant in elogind-dbus.c
+#if 0 /// elogind-dbus.c needs to access this
 static int send_prepare_for(Manager *m, InhibitWhat w, bool _active) {
+#else
+int send_prepare_for(Manager *m, InhibitWhat w, bool _active) {
+#endif // 0
 
         static const char * const signal_name[_INHIBIT_WHAT_MAX] = {
                 [INHIBIT_SHUTDOWN] = "PrepareForShutdown",
@@ -1520,6 +1523,7 @@ static int send_prepare_for(Manager *m, InhibitWhat w, bool _active) {
                                   active);
 }
 
+#if 0 /// elogind has its own variant in elogind-dbus.c
 static int execute_shutdown_or_sleep(
                 Manager *m,
                 InhibitWhat w,
@@ -1674,10 +1678,6 @@ static int delay_shutdown_or_sleep(
         return 0;
 }
 #endif // 0
-#if 0 /// elogind-dbus.c needs to access this
-#else
-int send_prepare_for(Manager *m, InhibitWhat w, bool _active) {
-#endif // 0
 
 #if 0 /// elogind has its own variant in elogind-dbus.c
 int bus_manager_shutdown_or_sleep_now_or_later(
@@ -1957,7 +1957,6 @@ fail:
         return log_error_errno(r, "Failed to write information about scheduled shutdowns: %m");
 }
 
-#if 0 /// elogind has its own variant in elogind-dbus.c
 static void reset_scheduled_shutdown(Manager *m) {
         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);
@@ -1973,6 +1972,7 @@ static void reset_scheduled_shutdown(Manager *m) {
         (void) unlink("/run/systemd/shutdown/scheduled");
 }
 
+#if 0 /// elogind has its own variant in elogind-dbus.c
 static int manager_scheduled_shutdown_handler(
                         sd_event_source *s,
                         uint64_t usec,
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 142ba55e9..d2125112d 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -33,6 +33,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "escape.h"
+#include "extract-word.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "format-util.h"
diff --git a/src/login/logind.h b/src/login/logind.h
index 7df3cbc2e..9b90049ab 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -88,7 +88,7 @@ struct Manager {
         sd_event_source *cgroups_agent_event_source;
 
         /* Flags */
-        bool test_run:1;
+        unsigned test_run_flags;
         bool is_system:1; /* true if elogind is its own cgroups manager */
 
         /* Data specific to the cgroup subsystem */