chiark / gitweb /
login: do not wall message on cancelling shutdown when Manager.enable_wall_messages...
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 7 May 2018 01:16:04 +0000 (10:16 +0900)
committerSven Eden <yamakuzure@gmx.net>
Fri, 24 Aug 2018 14:47:08 +0000 (16:47 +0200)
Fixes #8904.

src/login/logind-dbus.c

index 50349c176e8da29c5443c7f673179912c1f064dd..74269e5906e5f930bf9118046a2fd608628e3df1 100644 (file)
@@ -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;