summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2016-06-08 18:08:56 +0200
committerFranck Bui <fbui@suse.com>2016-06-08 18:18:42 +0200
commit8121f4d209eca85dcb11830800483cdfafbef9b7 (patch)
tree7b206ac596db962c4144ac7c509d98160924f3ed /src
parent40652ca4791fc3ae8f55c74b16227c0682b287b9 (diff)
logind: really handle *KeyIgnoreInhibited options in logind.conf
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 9a8089f97c..95a2a01173 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 (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;