util: return exit status in wait_for_terminate_and_warn()

diff --git a/src/quotacheck.c b/src/quotacheck.c
index 55c2f0c6d68f242a50e511ac74523374a7c7d660..da2da3b2e05adca5ddcc79ec6452ab0d0e444e51 100644 (file)
--- a/src/quotacheck.c
+++ b/src/quotacheck.c
@@ -107,7 +107,7 @@ int main(int argc, char *argv[]) {
                 _exit(1); /* Operational error */
         }
 
                 _exit(1); /* Operational error */
         }
 

-        r = wait_for_terminate_and_warn("quotacheck", pid) >= 0 ? EXIT_SUCCESS : EXIT_FAILURE;
+        r = wait_for_terminate_and_warn("quotacheck", pid) == 0 ? EXIT_SUCCESS : EXIT_FAILURE;

 
 finish:
         return r;
 
 finish:
         return r;

diff --git a/src/util.c b/src/util.c
index ee6217d64ca8f494bdaf156b2a0123f2b46fd7ac..b2baa1ba29aacb067bf02ad64d3d14badc87ea94 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -3616,7 +3616,7 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid) {
         if (status.si_code == CLD_EXITED) {
                 if (status.si_status != 0) {
                         log_warning("%s failed with error code %i.", name, status.si_status);
         if (status.si_code == CLD_EXITED) {
                 if (status.si_status != 0) {
                         log_warning("%s failed with error code %i.", name, status.si_status);

-                        return -EPROTO;
+                        return status.si_status;

                 }
 
                 log_debug("%s succeeded.", name);
                 }
 
                 log_debug("%s succeeded.", name);