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

Fixes #8904.

(cherry picked from commit 6e78fa4afd474dae984f3ee4a8477c623296a519)

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index f444ad9b4bf49bc5da987aeffbc81cb6d695d13a..e67708b300eec082bb47663556468b15e88f6fb1 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2243,7 +2243,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;