sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-19 04:23:48 +03:00
Code Activity

r17569: Make 'max smbd processes' more robust. Counting on the child to decrement a

Browse Source 
tdb entry is not the most reliable way to count children correctly.

This increments the number of children after a fork and decrements it upon
SIGCLD. I'm keeping a list of children just for consistency checks, so that we
at least get a debug level 0 message if something goes wrong.

Volker
This commit is contained in:
Volker Lendecke
2006-08-16 10:36:19 +00:00
committed by Gerald (Jerry) Carter
parent 2a66abca02
commit eb45de167d
4 changed files with 78 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
source/smbd/process.c
View File

@@ -1031,60 +1031,6 @@ static int construct_reply(char *inbuf,char *outbuf,int size,int bufsize)
return(outsize);
}
/****************************************************************************
Keep track of the number of running smbd's. This functionality is used to
'hard' limit Samba overhead on resource constrained systems.
****************************************************************************/
static BOOL process_count_update_successful = False;
static int32 increment_smbd_process_count(void)
{
int32 total_smbds;
if (lp_max_smbd_processes()) {
total_smbds = 0;
if (tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, 1) == -1)
return 1;
process_count_update_successful = True;
return total_smbds + 1;
}
return 1;
}
void decrement_smbd_process_count(void)
{
int32 total_smbds;
if (lp_max_smbd_processes() && process_count_update_successful) {
total_smbds = 1;
tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, -1);
}
}
static BOOL smbd_process_limit(void)
{
int32 total_smbds;
if (lp_max_smbd_processes()) {
/* Always add one to the smbd process count, as exit_server() always
* subtracts one.
*/
if (!conn_tdb_ctx()) {
DEBUG(0,("smbd_process_limit: max smbd processes parameter set with status parameter not \
set. Ignoring max smbd restriction.\n"));
return False;
}
total_smbds = increment_smbd_process_count();
return total_smbds > lp_max_smbd_processes();
}
else
return False;
}
/****************************************************************************
Process an smb from the client
****************************************************************************/
@@ -1103,8 +1049,8 @@ static void process_smb(char *inbuf, char *outbuf)
deny parameters before doing any parsing of the packet
passed to us by the client. This prevents attacks on our
parsing code from hosts not in the hosts allow list */
if (smbd_process_limit() ||
!check_access(smbd_server_fd(), lp_hostsallow(-1), lp_hostsdeny(-1))) {
if (!check_access(smbd_server_fd(), lp_hostsallow(-1),
lp_hostsdeny(-1))) {
/* send a negative session response "not listening on calling name" */
static unsigned char buf[5] = {0x83, 0, 0, 1, 0x81};
DEBUG( 1, ( "Connection denied from %s\n", client_addr() ) );