logind: fix determination of CanHibernate() and other calls

As suggest here:

https://github.com/systemd/systemd/issues/10250#issuecomment-426788301

Fixes: #10250
(This suggested patch has been converted into a proper commit by me,
Lennart, with attribution to the original author, @henryptung)

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 26253eb6195023ab4da3634b8caf5430b0fdca6d..c0dafa03ef0def1e74b451acbb5fd36f470fbaf4 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2267,11 +2267,13 @@ static int method_can_shutdown_or_sleep(
                 if (r < 0)
                         return r;
 
-                if (r > 0 && !result)
-                        result = "yes";
-                else if (challenge && (!result || streq(result, "yes")))
-                        result = "challenge";
-                else
+                if (r > 0) {
+                        if (!result)
+                                result = "yes";
+                } else if (challenge) {
+                        if (!result || streq(result, "yes"))
+                                result = "challenge";
+                } else
                         result = "no";
         }