From: Mantas Mikulėnas <grawity@gmail.com>
Date: Mon, 8 Aug 2016 08:07:38 +0000 (+0300)
Subject: Revert "logind: really handle *KeyIgnoreInhibited options in logind.conf"
X-Git-Tag: v231.3~38
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=79ebfb7e4e8934a6bc0e136b121965b5292040a4

Revert "logind: really handle *KeyIgnoreInhibited options in logind.conf"

This reverts commit 8121f4d209eca85dcb11830800483cdfafbef9b7.

The special 'key handling' inhibitors should always work regardless of
any *IgnoreInhibited settings – otherwise they're nearly useless.

Reverts: #3470
Fixes: #3897
(cherry picked from commit 06a70b918d4d753769a727239f75af8896006467)
---

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index d50f6ebf6..6b1b64229 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 (!ignore_inhibited && inhibit_key > 0) {
+        if (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;