]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
logind: fix merge issue
authorLennart Poettering <lennart@poettering.net>
Wed, 9 Sep 2020 17:17:31 +0000 (19:17 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 9 Sep 2020 18:13:57 +0000 (20:13 +0200)
The two PRs #16664 and #16635 individually passed CI, but when combined
cannot build. Since both are merged now, let's fix that.

src/login/logind-inhibit.c

index 14df9297ba802124bda961b8485ccc5461e22acf..f52d5babd7493a97d1bc23014f9422c663e7a63c 100644 (file)
@@ -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;