summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMantas Mikulėnas <grawity@gmail.com>2016-08-08 11:07:38 +0300
committerMantas Mikulėnas <grawity@gmail.com>2016-08-08 11:07:38 +0300
commit06a70b918d4d753769a727239f75af8896006467 (patch)
tree61f17d16ff75f90694c8f6c5a1e462f2eab16147 /src
parent3f193af8807be50913b87e1a5b88c494f8985667 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/login/logind-action.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 8ef48dbaa1..a950409254 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -85,7 +85,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;