]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
login: do not wall message on cancelling shutdown when Manager.enable_wall_messages... 8915/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 7 May 2018 01:16:04 +0000 (10:16 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 7 May 2018 01:17:58 +0000 (10:17 +0900)
Fixes #8904.

src/login/logind-dbus.c

index 0bf418e1f183126ebd4995fa7bf0d236f3c882ed..32c8def610d99c09423823ffdde44560ae03f3bb 100644 (file)
@@ -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;