diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-08-04 05:43:34 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-08-04 05:44:36 +0900 |
| commit | 18f689b1fa35c53580da62bfce875fb15d20d448 (patch) | |
| tree | 36287d22cd4fced5f8e72f2d0b833ca236a14990 /src/login/logind-action.c | |
| parent | b518e0266198443fcc8a4bf66be4e3642dc38405 (diff) | |
| download | systemd-18f689b1fa35c53580da62bfce875fb15d20d448.tar.gz | |
Revert "logind: remove unused check"
This reverts commit f2330acda408a34451d5e15380fcdd225a672473.
Fixes #13255.
Diffstat (limited to 'src/login/logind-action.c')
| -rw-r--r-- | src/login/logind-action.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/login/logind-action.c b/src/login/logind-action.c index fa92f4870a..140953eec1 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -61,8 +61,12 @@ int manager_handle_action( int r; assert(m); - /* We should be called only with valid actions different than HANDLE_IGNORE. */ - assert(handle > HANDLE_IGNORE && handle < _HANDLE_ACTION_MAX); + + /* If the key handling is turned off, don't do anything */ + if (handle == HANDLE_IGNORE) { + log_debug("Refusing operation, as it is turned off."); + return 0; + } if (inhibit_key == INHIBIT_HANDLE_LID_SWITCH) { /* If the last system suspend or startup is too close, |