diff options
| -rw-r--r-- | source3/lib/debug.c | 13 | ||||
| -rw-r--r-- | source3/smbd/process.c | 7 |
2 files changed, 5 insertions, 15 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c index 62fda5741c..a2e8574bbd 100644 --- a/source3/lib/debug.c +++ b/source3/lib/debug.c @@ -688,20 +688,15 @@ void check_log_size( void ) int maxlog; SMB_STRUCT_STAT st; - /* - * We need to be root to check/change log-file, skip this and let the main - * loop check do a new check as root. - */ - - if( geteuid() != 0 ) - return; - if(log_overflow || !need_to_check_log_size() ) return; maxlog = lp_max_log_size() * 1024; if( sys_fstat( x_fileno( dbf ), &st ) == 0 && st.st_size > maxlog ) { + + become_root_uid_only(); + (void)reopen_logs(); if( dbf && get_file_size( debugf ) > maxlog ) { pstring name; @@ -714,6 +709,8 @@ void check_log_size( void ) (void)rename(name, debugf); } } + + unbecome_root_uid_only(); } /* diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 846f338ccf..83072817a3 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1448,13 +1448,6 @@ machine %s in domain %s.\n", global_myname(), lp_workgroup())); update_monitored_printq_cache(); - /* - * Now we are root, check if the log files need pruning. - * Force a log file check. - */ - force_check_log_size(); - check_log_size(); - /* Send any queued printer notify message to interested smbd's. */ print_notify_send_messages(0); |