import: introduce new mini-daemon systemd-importd, and make machinectl a client to it

[elogind.git] / src / import / import-tar.c

diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index e09ecaba115d612051791cf54ec1aad43c17ee9b..e311ad277f30982b8a245cb8bc0912d3139a1cb4 100644 (file)
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -29,9 +29,10 @@
 #include "util.h"
 #include "macro.h"
 #include "mkdir.h"
+#include "import-util.h"
 #include "curl-util.h"
 #include "import-job.h"
-#include "import-util.h"
+#include "import-common.h"
 #include "import-tar.h"
 
 struct TarImport {
@@ -292,7 +293,7 @@ static int tar_import_job_on_open_disk(ImportJob *j) {
                 }
 
                 if (pipefd[0] != STDIN_FILENO)
-                        safe_close(pipefd[0]);
+                        pipefd[0] = safe_close(pipefd[0]);
 
                 null_fd = open("/dev/null", O_WRONLY|O_NOCTTY);
                 if (null_fd < 0) {
@@ -306,7 +307,11 @@ static int tar_import_job_on_open_disk(ImportJob *j) {
                 }
 
                 if (null_fd != STDOUT_FILENO)
-                        safe_close(null_fd);
+                        null_fd = safe_close(null_fd);
+
+                fd_cloexec(STDIN_FILENO, false);
+                fd_cloexec(STDOUT_FILENO, false);
+                fd_cloexec(STDERR_FILENO, false);
 
                 execlp("tar", "tar", "--numeric-owner", "-C", i->temp_path, "-px", NULL);
                 log_error_errno(errno, "Failed to execute tar: %m");
@@ -374,5 +379,4 @@ int tar_import_pull(TarImport *i, const char *url, const char *local, bool force
         }
 
         return 0;
-
 }