log fds more permissive

Since containers#112 the anonymous pipes are supposed to be more permissive. Restoring the permissive state by default. 32816bd introduced the tty check for FreeBSD, assuming it is needed there. Close containers#429 Signed-off-by: afazekas <[email protected]>
afazekas · Jun 8, 2023 · 563abab · 563abab
1 parent c26648e
commit 563abab
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/conmon.c b/src/conmon.c
@@ -36,6 +36,12 @@ static void disconnect_std_streams(int dev_null_r, int dev_null_w)
 
 #define DEFAULT_UMASK 0022
 
+#ifdef __FreeBSD__
+#define ISATTY(x) isatty(x)
+#else
+#define ISATTY(x) true
+#endif
+
 int main(int argc, char *argv[])
 {
 	setlocale(LC_ALL, "");
@@ -240,21 +246,21 @@ int main(int argc, char *argv[])
 				workerfd_stdin = dev_null_r;
 			if (dup2(workerfd_stdin, STDIN_FILENO) < 0)
 				_pexit("Failed to dup over stdin");
-			if (workerfd_stdin != dev_null_r && isatty(workerfd_stdin) && fchmod(STDIN_FILENO, 0777) < 0)
+			if (workerfd_stdin != dev_null_r && ISATTY(workerfd_stdin) && fchmod(STDIN_FILENO, 0777) < 0)
 				nwarn("Failed to chmod stdin");
 
 			if (workerfd_stdout < 0)
 				workerfd_stdout = dev_null_w;
 			if (dup2(workerfd_stdout, STDOUT_FILENO) < 0)
 				_pexit("Failed to dup over stdout");
-			if (workerfd_stdout != dev_null_w && isatty(workerfd_stdout) && fchmod(STDOUT_FILENO, 0777) < 0)
+			if (workerfd_stdout != dev_null_w && ISATTY(workerfd_stdout) && fchmod(STDOUT_FILENO, 0777) < 0)
 				nwarn("Failed to chmod stdout");
 
 			if (workerfd_stderr < 0)
 				workerfd_stderr = workerfd_stdout;
 			if (dup2(workerfd_stderr, STDERR_FILENO) < 0)
 				_pexit("Failed to dup over stderr");
-			if (workerfd_stderr != dev_null_w && isatty(workerfd_stderr) && fchmod(STDERR_FILENO, 0777) < 0)
+			if (workerfd_stderr != dev_null_w && ISATTY(workerfd_stderr) && fchmod(STDERR_FILENO, 0777) < 0)
 				nwarn("Failed to chmod stderr");
 		}
 		/* If LISTEN_PID env is set, we need to set the LISTEN_PID