diff options
| author | Jeremy Allison <jra@samba.org> | 2004-12-14 00:25:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:36 -0500 |
| commit | 5b713a206bf9c05faad750512886f4bbeebb21f8 (patch) | |
| tree | b40f70499c5557dc9d0b45e4db4660073a56f7a7 /source3/smbd | |
| parent | 00eede9a6b7e258faa6abe4de0d39a16bbcebd14 (diff) | |
| download | samba-5b713a206bf9c05faad750512886f4bbeebb21f8.tar.gz samba-5b713a206bf9c05faad750512886f4bbeebb21f8.tar.bz2 samba-5b713a206bf9c05faad750512886f4bbeebb21f8.zip | |
r4186: Fix client & server to allow 127k READX calls.
Jeremy.
(This used to be commit 831cb21a874601e4536c2cf76c5351e1d0defcb5)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/process.c | 3 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 8adc5c2e66..aa1f574767 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1177,8 +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 wct = CVAL(outbuf,smb_wct); - int outsize = smb_size + 2*wct + SVAL(outbuf,smb_vwv0+2*wct); + int outsize = smb_len(outbuf); /* maybe its not chained */ if (smb_com2 == 0xFF) { diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 825f76fcd5..3dae67efef 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2148,6 +2148,7 @@ int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int length SSVAL(outbuf,smb_vwv2,0xFFFF); /* Remaining - must be -1. */ SSVAL(outbuf,smb_vwv5,smb_maxcnt); SSVAL(outbuf,smb_vwv6,smb_offset(data,outbuf)); + SSVAL(outbuf,smb_vwv7,((smb_maxcnt >> 16) & 1)); SSVAL(smb_buf(outbuf),-2,smb_maxcnt); SCVAL(outbuf,smb_vwv0,0xFF); set_message(outbuf,12,smb_maxcnt,False); @@ -2196,9 +2197,11 @@ int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int length return(UNIXERROR(ERRDOS,ERRnoaccess)); } + 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)); + SSVAL(outbuf,smb_vwv7,((nread >> 16) & 1)); SSVAL(smb_buf(outbuf),-2,nread); DEBUG( 3, ( "send_file_readX fnum=%d max=%d nread=%d\n", |