From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 8 Sep 2012 02:56:35 +0000 (-0400)
Subject: Make systemd-inhibit --list work
X-Git-Tag: v190~150
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=680258b112e8a78769a42abb71ada4981ce701e1;p=elogind.git

Make systemd-inhibit --list work

The code in the print_inhibitors function had an unintended
unconditional early exit, causing it to never print any
inhibitors.
---

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 029c9549d..62a8223e6 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -86,9 +86,10 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                         &reply,
                         NULL,
                         DBUS_TYPE_INVALID);
-        if (r)
-                return -ENOMEM;
+        if (r) {
+                r = -ENOMEM;
                 goto finish;
+        }
 
         if (!dbus_message_iter_init(reply, &iter)) {
                 r = -ENOMEM;