shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

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

Browse Source 
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
This commit is contained in:
Mantas Mikulėnas 2016-08-08 11:07:38 +03:00
parent 3f193af880
commit 06a70b918d
No known key found for this signature in database
GPG Key ID: D24F6CB2C1B52632
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/login/logind-action.c
View File

@ -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;