summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-05-16 01:36:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:09 -0500
commit2b2eec4cfc0684009e135331f9e4e693a5def508 (patch)
tree3da5d91eaae8c5d2e9c225009afeba5e3320a0cf
parentbfb863c57cd1b8fc16cf7cda3cc3989104b4246c (diff)
downloadsamba-2b2eec4cfc0684009e135331f9e4e693a5def508.tar.gz
samba-2b2eec4cfc0684009e135331f9e4e693a5def508.tar.bz2
samba-2b2eec4cfc0684009e135331f9e4e693a5def508.zip
r22925: Sync read_and_X with 3.0.26 code (use setup_readX_header()).
Jeremy. (This used to be commit e1052c0e3d50473a9ded6092b6a85d78590a00e7)
-rw-r--r--source3/smbd/reply.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 51ac95caf9..24fff5da52 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2666,12 +2666,7 @@ int send_file_readX(connection_struct *conn, char *inbuf,char *outbuf,int length
return(UNIXERROR(ERRDOS,ERRnoaccess));
}
- outsize = set_message(inbuf, 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);
+ outsize = setup_readX_header(inbuf, outbuf,nread);
DEBUG( 3, ( "send_file_readX fnum=%d max=%d nread=%d\n",
fsp->fnum, (int)smb_maxcnt, (int)nread ) );