From 00c297256b05cc08db92e312d5a45a2d5c0d8425 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 7 May 2018 10:16:04 +0900
Subject: [PATCH] login: do not wall message on cancelling shutdown when
 Manager.enable_wall_messages is false

Fixes #8904.
---
 src/login/logind-dbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 50349c176..74269e590 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2350,7 +2350,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;
-- 
2.30.2