From: Robert Swiecki <swiecki@google.com>
Date: Tue, 15 Mar 2016 19:42:03 +0000 (+0100)
Subject: No need to redirect log fd anymore
X-Git-Tag: 1.2~75
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3bc8cce90ede4aed99e594cbfde5803cd1d2d44f;p=platform%2Fupstream%2Fnsjail.git

No need to redirect log fd anymore
---

diff --git a/contain.c b/contain.c
index 02cc8d5..a77d966 100644
--- 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 1ea0e99..edba108 100644
--- 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 4b3aa7a..c1e8ebc 100644
--- 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;