sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

Log file check patch from Mattias Gronlund <Mattias.Gronlund@sa.erisoft.se>.

Browse Source 
Modified to do checks in timeout processing not in main loop. This (IMHO)
is the correct place as (a) we are already root, and (b) it is guarenteed
to be called every 200 smb requests.
Jeremy.
(This used to be commit c3794fd29fdc4e5a0dbd725cdc24fe210934caf2)
This commit is contained in:
Jeremy Allison 2000-04-15 00:31:56 +00:00
parent 067b341a01
commit ce5e230952
3 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/proto.h
View File

@ -54,6 +54,8 @@ void sig_usr1( int sig );
void setup_logging( char *pname, BOOL interactive );
void reopen_logs( void );
void force_check_log_size( void );
BOOL need_to_check_log_size( void );
void check_log_size( void );
void dbgflush( void );
BOOL dbghdr( int level, char *file, char *func, int line );
@ -1262,7 +1264,6 @@ BOOL lp_nis_home_map(void);
BOOL lp_bind_interfaces_only(void);
BOOL lp_unix_password_sync(void);
BOOL lp_passwd_chat_debug(void);
BOOL lp_ole_locking_compat(void);
BOOL lp_nt_smb_support(void);
BOOL lp_nt_pipe_support(void);
BOOL lp_nt_acl_support(void);

38
source3/lib/debug.c
View File

@ -239,25 +239,51 @@ void reopen_logs( void )
* ************************************************************************** **
*/
void force_check_log_size( void )
{
{
debug_count = 100;
} /* force_check_log_size */
}
/***************************************************************************
Check to see if there is any need to check if the logfile has grown too big.
**************************************************************************/
BOOL need_to_check_log_size( void )
{
int maxlog;
if( debug_count++ < 100 )
return( False );
maxlog = lp_max_log_size() * 1024;
if( !dbf || maxlog <= 0 ) {
debug_count = 0;
return(False);
}
return( True );
}
/* ************************************************************************** **
* Check to see if the log has grown to be too big.
* ************************************************************************** **
*/
static void check_log_size( void )
void check_log_size( void )
{
int maxlog;
SMB_STRUCT_STAT st;
if( debug_count++ < 100 || geteuid() != 0 )
/*
* 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( !need_to_check_log_size() )
return;
maxlog = lp_max_log_size() * 1024;
if( !dbf || maxlog <= 0 )
return;
if( sys_fstat( fileno( dbf ), &st ) == 0 && st.st_size > maxlog )
{

6
source3/smbd/process.c
View File

@ -970,6 +970,12 @@ machine %s in domain %s.\n", global_myname, global_myworkgroup ));
*/
process_pending_change_notify_queue(t);
/*
* Now we are root, check if the log files need pruning.
*/
if(need_to_check_log_size())
check_log_size();
/*
* Modify the select timeout depending upon
* what we have remaining in our queues.