No need to redirect log fd anymore

diff --git a/contain.c b/contain.c
index 02cc8d5cf4acf1945f661201446ec1dc26b8ec1e..a77d9662498b36e8498f6b8b8fa677a23e2ac737 100644 (file)
--- a/contain.c
+++ b/contain.c
@@ -251,13 +251,8 @@ static bool containMakeFdsCOE(void)
        return false;
 }
 
-bool containSetupFD(struct nsjconf_t * nsjconf, int fd_in, int fd_out, int fd_err, int fd_log)
+bool containSetupFD(struct nsjconf_t * nsjconf, int fd_in, int fd_out, int fd_err)
 {
-       /* Make sure all logs go to the parent process from now on */
-       if (fd_log != -1) {
-               logRedirectLogFD(fd_log);
-       }
-
        if (nsjconf->mode != MODE_LISTEN_TCP) {
                if (nsjconf->is_silent == false) {
                        return true;

diff --git a/contain.h b/contain.h
index 1ea0e9946f5b673fda45d7e9c049873bf01e4335..edba108cc362850dd01c305132d0457356fea549 100644 (file)
--- a/contain.h
+++ b/contain.h
@@ -26,7 +26,7 @@
 
 #include "common.h"
 
-bool containSetupFD(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err, int fd_log);
+bool containSetupFD(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err);
 bool containContain(struct nsjconf_t *nsjconf);
 
 #endif                         /* NS_CONTAIN_H */

diff --git a/subproc.c b/subproc.c
index 4b3aa7ab99c460f9de4fea6b37ba90d5648539b2..c1e8ebc20e4dc5e680ce8c2d0235e1d34a8e15bc 100644 (file)
--- a/subproc.c
+++ b/subproc.c
@@ -51,7 +51,7 @@ const char subprocDoneChar = 'D';
 
 static int subprocNewProc(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err, int pipefd)
 {
-       if (containSetupFD(nsjconf, fd_in, fd_out, fd_err, pipefd) == false) {
+       if (containSetupFD(nsjconf, fd_in, fd_out, fd_err) == false) {
                exit(1);
        }
        char doneChar;