From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 22 Jul 2016 15:39:21 +0000 (+0200)
Subject: systemctl: never check inhibitors if -H or -M are used (#3781)
X-Git-Tag: v231~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e08ab37902bbd6e46ad1365f8ffa87fd700683e2;p=thirdparty%2Fsystemd.git

systemctl: never check inhibitors if -H or -M are used (#3781)

Don't check inhibitors when operating remotely. The interactivity inhibitors
imply can#t be provided anyway, and the current code checks for local sessions
directly, via various sd_session_xyz() APIs, hence bypass it entirely if we
operate on remote systems.

Fixes: #3476
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d3f437411a9..1dbe35997a7 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3033,6 +3033,9 @@ static int logind_check_inhibitors(enum action a) {
         if (!on_tty())
                 return 0;
 
+        if (arg_transport != BUS_TRANSPORT_LOCAL)
+                return 0;
+
         r = acquire_bus(BUS_FULL, &bus);
         if (r < 0)
                 return r;