From: Franck Bui <fbui@suse.com>
Date: Wed, 8 Jun 2016 16:08:56 +0000 (+0200)
Subject: logind: really handle *KeyIgnoreInhibited options in logind.conf
X-Git-Tag: v231.3~110
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=dbb696ebcce7bc1f8d4a301348f649d637914b68;p=elogind.git

logind: really handle *KeyIgnoreInhibited options in logind.conf
---

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 407040519..020815409 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -94,7 +94,7 @@ int manager_handle_action(
         }
 
         /* If the key handling is inhibited, don't do anything */
-        if (inhibit_key > 0) {
+        if (!ignore_inhibited && inhibit_key > 0) {
                 if (manager_is_inhibited(m, inhibit_key, INHIBIT_BLOCK, NULL, true, false, 0, NULL)) {
                         log_debug("Refusing operation, %s is inhibited.", inhibit_what_to_string(inhibit_key));
                         return 0;