X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Finhibit.c;h=cabf1b9cef96420f1e76811d98813980036c7e41;hb=490d99e9bf949a855ff9183465f2c265777a3272;hp=029c9549d2ecafb73f7036402afe3610e8c5b384;hpb=b9c26b413497a0014ac2058a0ec04849a83df1ea;p=elogind.git

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 029c9549d..cabf1b9ce 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -43,9 +43,9 @@ static enum {
 
 static int inhibit(DBusConnection *bus, DBusError *error) {
         DBusMessage *reply = NULL;
-        int fd;
+        int r;
 
-        fd = bus_method_call_with_reply (
+        r = bus_method_call_with_reply(
                         bus,
                         "org.freedesktop.login1",
                         "/org/freedesktop/login1",
@@ -58,26 +58,26 @@ static int inhibit(DBusConnection *bus, DBusError *error) {
                         DBUS_TYPE_STRING, &arg_why,
                         DBUS_TYPE_STRING, &arg_mode,
                         DBUS_TYPE_INVALID);
-        if (fd)
-                return fd;
+        if (r < 0)
+                return r;
 
         if (!dbus_message_get_args(reply, error,
-                                   DBUS_TYPE_UNIX_FD, &fd,
+                                   DBUS_TYPE_UNIX_FD, &r,
                                    DBUS_TYPE_INVALID))
-                fd = -EIO;
+                r = -EIO;
 
         dbus_message_unref(reply);
 
-        return fd;
+        return r;
 }
 
 static int print_inhibitors(DBusConnection *bus, DBusError *error) {
-        DBusMessage *reply;
+        DBusMessage *reply = NULL;
         unsigned n = 0;
         DBusMessageIter iter, sub, sub2;
         int r;
 
-        r = bus_method_call_with_reply (
+        r = bus_method_call_with_reply(
                         bus,
                         "org.freedesktop.login1",
                         "/org/freedesktop/login1",
@@ -86,8 +86,7 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                         &reply,
                         NULL,
                         DBUS_TYPE_INVALID);
-        if (r)
-                return -ENOMEM;
+        if (r < 0)
                 goto finish;
 
         if (!dbus_message_iter_init(reply, &iter)) {
@@ -99,7 +98,6 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                 r = -EIO;
                 goto finish;
         }
-        dbus_message_iter_recurse(&iter, &sub);
 
         printf("%-21s %-20s %-20s %-5s %6s %6s\n",
                "WHAT",
@@ -109,7 +107,7 @@ static int print_inhibitors(DBusConnection *bus, DBusError *error) {
                "UID",
                "PID");
 
-
+        dbus_message_iter_recurse(&iter, &sub);
         while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
                 const char *what, *who, *why, *mode;
                 char *ewho, *ewhy;
@@ -305,6 +303,8 @@ int main(int argc, char *argv[]) {
                         /* Child */
 
                         close_nointr_nofail(fd);
+                        close_all_fds(NULL, 0);
+
                         execvp(argv[optind], argv + optind);
                         log_error("Failed to execute %s: %m", argv[optind]);
                         _exit(EXIT_FAILURE);