From 5265b45b1c0daac1ffc870177fc661186e0250c5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 16 Feb 2015 15:59:11 +1300 Subject: [PATCH] debug: Set close-on-exec for the main log file FD This does not change the properties of dup2() of the fd as STDERR, however this is closed before we start smbd or winbindd as child processes. This is needed otherwise the logfile remains open in the child process, and logfile rotation can mean this old log remains on disk indefinatly. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11100 Pair-programmed-with: Garming Sam Signed-off-by: Garming Sam Signed-off-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Feb 16 11:42:47 CET 2015 on sn-devel-104 (based on commit 1d95b0afc3547a91f8558873ce58652c271ed9eb) --- lib/util/debug.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/util/debug.c b/lib/util/debug.c index a46b275..cf42d36 100644 --- a/lib/util/debug.c +++ b/lib/util/debug.c @@ -596,6 +596,7 @@ bool reopen_logs_internal(void) log_overflow = false; ret = false; } else { + smb_set_close_on_exec(new_fd); old_fd = state.fd; state.fd = new_fd; debug_close_fd(old_fd); @@ -729,6 +730,7 @@ void check_log_size( void ) */ int fd = open( "/dev/console", O_WRONLY, 0); if (fd != -1) { + smb_set_close_on_exec(fd); state.fd = fd; DEBUG(0,("check_log_size: open of debug file %s failed - using console.\n", state.debugf )); @@ -791,6 +793,7 @@ void check_log_size( void ) errno = old_errno; goto done; } + smb_set_close_on_exec(fd); state.fd = fd; } } -- 1.9.3