sys-apps/systemd/files/243-rc1-revert-logind-remove-unused-check.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31

From 18f689b1fa35c53580da62bfce875fb15d20d448 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 4 Aug 2019 05:43:34 +0900
Subject: [PATCH] Revert "logind: remove unused check"

This reverts commit f2330acda408a34451d5e15380fcdd225a672473.

Fixes #13255.
---
 src/login/logind-action.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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,