tree-wide: whenever we fork off a foreign child process reset signal mask/handlers

[elogind.git] / src / login / inhibit.c

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index fcc8d722359c00cde4d1199791dcb5f989f847dc..0e5dce59258c47ae797a668af8dcc3d57be5ee6d 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -31,6 +31,9 @@
 #include "util.h"
 #include "build.h"
 #include "strv.h"
+#include "formats-util.h"
+#include "process-util.h"
+#include "signal-util.h"
 
 static const char* arg_what = "idle:sleep:shutdown";
 static const char* arg_who = NULL;
@@ -259,7 +262,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;
                 }
 
@@ -272,6 +275,9 @@ int main(int argc, char *argv[]) {
                 if (pid == 0) {
                         /* Child */
 
+                        (void) reset_all_signal_handlers();
+                        (void) reset_signal_mask();
+
                         close_all_fds(NULL, 0);
 
                         execvp(argv[optind], argv + optind);