sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

- fix a bug handling readraw packets that caused the timeout to be 30

Browse Source 
milliseconds instead of 30 seconds as was intended. Thanks to Paul
Nelson for finding this bug.
(This used to be commit 78f62c83be5df6b66aa0b5e83b2d290f97ce53c2)
This commit is contained in:
Andrew Tridgell 1996-08-21 14:15:09 +00:00
parent 5d39d23f04
commit 3d088fd65e
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/include/smb.h
View File

@ -101,12 +101,8 @@ typedef unsigned int uint32;
#define DEF_CREATE_MASK (0755)
#endif
#ifndef DEFAULT_PIPE_TIMEOUT
#define DEFAULT_PIPE_TIMEOUT 10000000 /* Ten seconds */
#endif
/* how long to wait for secondary SMB packets (seconds) */
#define SMB_SECONDARY_WAIT 30
/* how long to wait for secondary SMB packets (milli-seconds) */
#define SMB_SECONDARY_WAIT (60*1000)
/* debugging code */
#ifndef SYSLOG

2
source3/smbd/ipc.c
View File

@ -2823,7 +2823,7 @@ int reply_trans(char *inbuf,char *outbuf)
{
int pcnt,poff,dcnt,doff,pdisp,ddisp;
if (!receive_smb(Client,inbuf, SMB_SECONDARY_WAIT*1000) ||
if (!receive_smb(Client,inbuf, SMB_SECONDARY_WAIT) ||
CVAL(inbuf, smb_com) != SMBtrans)
{
DEBUG(2,("Invalid secondary trans2 packet\n"));

2
source3/smbd/trans2.c
View File

@ -1554,7 +1554,7 @@ int reply_trans2(char *inbuf,char *outbuf,int length,int bufsize)
while( num_data_sofar < total_data || num_params_sofar < total_params)
{
if(!receive_smb(Client,inbuf, SMB_SECONDARY_WAIT*1000) ||
if(!receive_smb(Client,inbuf, SMB_SECONDARY_WAIT) ||
CVAL(inbuf, smb_com) != SMBtranss2)
{
outsize = set_message(outbuf,0,0,True);