diff options
| author | Jeremy Allison <jra@samba.org> | 2004-12-14 01:11:22 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:37 -0500 |
| commit | 32f9ee7c206138b2f26254d9b4b7b45f4490ef38 (patch) | |
| tree | 7a399e79fa4dca27954ff9e06ec3452efe30d093 | |
| parent | 4730a56263b0547faabbfadb845e8b92bd0b9441 (diff) | |
| download | samba-32f9ee7c206138b2f26254d9b4b7b45f4490ef38.tar.gz samba-32f9ee7c206138b2f26254d9b4b7b45f4490ef38.tar.bz2 samba-32f9ee7c206138b2f26254d9b4b7b45f4490ef38.zip | |
r4190: When changing length calculations, get them right......
Jeremy.
(This used to be commit 63cfa904ad186bb9d793584d319bd4a7107cc8b9)
| -rw-r--r-- | source3/smbd/process.c | 2 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index aa1f574767..1372ebbf45 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1177,7 +1177,7 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize) int outsize2; char inbuf_saved[smb_wct]; char outbuf_saved[smb_wct]; - int outsize = smb_len(outbuf); + int outsize = smb_len(outbuf) + 4; /* maybe its not chained */ if (smb_com2 == 0xFF) { diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 3dae67efef..eead0bc1a1 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2112,6 +2112,7 @@ Returning short read of maximum allowed for compatibility with Windows 2000.\n", int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int length, int len_outbuf, files_struct *fsp, SMB_OFF_T startpos, size_t smb_maxcnt) { + int outsize = 0; ssize_t nread = -1; char *data = smb_buf(outbuf); @@ -2197,7 +2198,7 @@ int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int length return(UNIXERROR(ERRDOS,ERRnoaccess)); } - set_message(outbuf,12,nread,False); + outsize = set_message(outbuf,12,nread,False); SSVAL(outbuf,smb_vwv2,0xFFFF); /* Remaining - must be -1. */ SSVAL(outbuf,smb_vwv5,nread); SSVAL(outbuf,smb_vwv6,smb_offset(data,outbuf)); @@ -2207,7 +2208,7 @@ int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int length DEBUG( 3, ( "send_file_readX fnum=%d max=%d nread=%d\n", fsp->fnum, (int)smb_maxcnt, (int)nread ) ); - return nread; + return outsize; } /**************************************************************************** |