]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
logind: really handle *KeyIgnoreInhibited options in logind.conf
authorFranck Bui <fbui@suse.com>
Wed, 8 Jun 2016 16:08:56 +0000 (18:08 +0200)
committerFranck Bui <fbui@suse.com>
Wed, 8 Jun 2016 16:18:42 +0000 (18:18 +0200)
src/login/logind-action.c

index 9a8089f97c43ce567b86db812fa21c2d72bfde2f..95a2a011732e28e5ed1e34df62c24279119f4cc5 100644 (file)
@@ -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;