From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 3 Aug 2019 20:43:34 +0000 (+0900)
Subject: Revert "logind: remove unused check"
X-Git-Tag: v243-rc2~64^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18f689b1fa35c53580da62bfce875fb15d20d448;p=thirdparty%2Fsystemd.git

Revert "logind: remove unused check"

This reverts commit f2330acda408a34451d5e15380fcdd225a672473.

Fixes #13255.
---

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index fa92f4870a2..140953eec10 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,