r22925: Sync read_and_X with 3.0.26 code (use setup_readX_header()).

Jeremy.
(This used to be commit e1052c0e3d50473a9ded6092b6a85d78590a00e7)

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 51ac95caf9fe38df52c963fd2ef758ff032fc15a..24fff5da52d0a9f7287d52afcf22a14de1cafec9 100644 (file)
--- 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 ) );