Merge pull request #8915 from yuwata/fix-8904

 login: do not wall message on cancelling shutdown when Manager.enable_wall_messages is false

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index ee4dfff9f11d481a9cf7b473ca423708d737bdd6..32c8def610d99c09423823ffdde44560ae03f3bb 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2224,7 +2224,7 @@ static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userd
         cancelled = m->scheduled_shutdown_type != NULL;
         reset_scheduled_shutdown(m);
 
-        if (cancelled) {
+        if (cancelled && m->enable_wall_messages) {
                 _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
                 const char *tty = NULL;
                 uid_t uid = 0;
@@ -2552,7 +2552,7 @@ static int method_set_wall_message(
         int r;
         Manager *m = userdata;
         char *wall_message;
-        int enable_wall_messages;
+        unsigned enable_wall_messages;
 
         assert(message);
         assert(m);