From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 9 Sep 2020 17:17:31 +0000 (+0200)
Subject: logind: fix merge issue
X-Git-Tag: v247-rc1~272
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=197db625a30850f4234eed5994bc0e6cd3e7242c;p=thirdparty%2Fsystemd.git

logind: fix merge issue

The two PRs #16664 and #16635 individually passed CI, but when combined
cannot build. Since both are merged now, let's fix that.
---

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 14df9297ba8..f52d5babd74 100644
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -522,7 +522,7 @@ int inhibit_what_from_string(const char *s) {
                         what |= INHIBIT_HANDLE_HIBERNATE_KEY;
                 else if (streq(word, "handle-lid-switch"))
                         what |= INHIBIT_HANDLE_LID_SWITCH;
-                else if (l == 17 && strneq(word, "handle-reboot-key", l))
+                else if (streq(word, "handle-reboot-key"))
                         what |= INHIBIT_HANDLE_REBOOT_KEY;
                 else
                         return _INHIBIT_WHAT_INVALID;