X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Finhibit.c;h=9f349b7c73e8e529b458e7879ebb9e654916f936;hb=6f5035f2db6ab7b4beae46c44b95e6a8b6d956b5;hp=b81cf0f6887ff902efe6a7f1ead9b3028aa67d07;hpb=56f64d95763a799ba4475daf44d8e9f72a1bd474;p=elogind.git diff --git a/src/login/inhibit.c b/src/login/inhibit.c index b81cf0f68..9f349b7c7 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -20,7 +20,6 @@ ***/ #include -#include #include #include #include @@ -260,7 +259,7 @@ int main(int argc, char *argv[]) { fd = inhibit(bus, &error); if (fd < 0) { - log_error("Failed to inhibit: %s", bus_error_message(&error, -r)); + log_error("Failed to inhibit: %s", bus_error_message(&error, fd)); return EXIT_FAILURE; } @@ -280,7 +279,7 @@ int main(int argc, char *argv[]) { _exit(EXIT_FAILURE); } - r = wait_for_terminate_and_warn(argv[optind], pid); + r = wait_for_terminate_and_warn(argv[optind], pid, true); return r < 0 ? EXIT_FAILURE : r; }