svn commit: samba r22925 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2007-05-16 01:36:23 +0000 (Wed, 16 May 2007)
New Revision: 22925

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22925

Log:
Sync read_and_X with 3.0.26 code (use setup_readX_header()).
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2007-05-16 01:34:22 UTC (rev 22924)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2007-05-16 01:36:23 UTC (rev 22925)
@@ -2666,12 +2666,7 @@
 			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 ) );