X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Finhibit.c;h=4735df7d3b1c2f12371974159c738835f935170f;hp=08a4701161976c4b71f5a52597187db281229d58;hb=2a7cccf065c73abfe263d9c0b24bab24b6e68f29;hpb=3137e0bd5290fea67e52cfe7ff657c3af400b548

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 08a470116..4735df7d3 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -72,7 +72,7 @@ static int inhibit(DBusConnection *bus, DBusError *error) {
 }
 
 static int print_inhibitors(DBusConnection *bus, DBusError *error) {
-        DBusMessage *reply;
+        DBusMessage *reply = NULL;
         unsigned n = 0;
         DBusMessageIter iter, sub, sub2;
         int r;
@@ -98,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",
@@ -108,6 +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;
@@ -160,8 +160,10 @@ static int help(void) {
                "Execute a process while inhibiting shutdown/sleep/idle.\n\n"
                "  -h --help               Show this help\n"
                "     --version            Show package version\n"
-               "     --what=WHAT          Operations to inhibit, colon separated list of idle,\n"
-               "                          sleep, shutdown\n"
+               "     --what=WHAT          Operations to inhibit, colon separated list of:\n"
+               "                          shutdown, sleep, idle, handle-power-key,\n"
+               "                          handle-suspend-key, handle-hibernate-key,\n"
+               "                          handle-lid-switch\n"
                "     --who=STRING         A descriptive string who is inhibiting\n"
                "     --why=STRING         A descriptive string why is being inhibited\n"
                "     --mode=MODE          One of block or delay\n"
@@ -303,6 +305,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);