svn commit: samba r24325 - in branches/SAMBA_3_2/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2007-08-11 11:20:21 +0000 (Sat, 11 Aug 2007)
New Revision: 24325

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

Log:
Push down reply_prep_legacy in reply_read_and_X
Modified:
   branches/SAMBA_3_2/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/reply.c	2007-08-11 10:53:36 UTC (rev 24324)
+++ branches/SAMBA_3_2/source/smbd/reply.c	2007-08-11 11:20:21 UTC (rev 24325)
@@ -2900,20 +2900,12 @@
 		return;
 	}
 
-	if (!reply_prep_legacy(req, &inbuf, &outbuf, &length, &bufsize)) {
-		reply_nterror(req, NT_STATUS_NO_MEMORY);
-		END_PROFILE(SMBreadX);
-		return;
-	}
-
-	set_message(inbuf,outbuf,12,0,True);
-
 	if (global_client_caps & CAP_LARGE_READX) {
-		size_t upper_size = SVAL(inbuf,smb_vwv7);
+		size_t upper_size = SVAL(req->inbuf,smb_vwv7);
 		smb_maxcnt |= (upper_size<<16);
 		if (upper_size > 1) {
 			/* Can't do this on a chained packet. */
-			if ((CVAL(inbuf,smb_vwv0) != 0xFF)) {
+			if ((CVAL(req->inbuf,smb_vwv0) != 0xFF)) {
 				reply_nterror(req, NT_STATUS_NOT_SUPPORTED);
 				END_PROFILE(SMBreadX);
 				return;
@@ -2935,12 +2927,12 @@
 		}
 	}
 
-	if(CVAL(inbuf,smb_wct) == 12) {
+	if (req->wct == 12) {
 #ifdef LARGE_SMB_OFF_T
 		/*
 		 * This is a large offset (64 bit) read.
 		 */
-		startpos |= (((SMB_OFF_T)IVAL(inbuf,smb_vwv10)) << 32);
+		startpos |= (((SMB_OFF_T)IVAL(req->inbuf,smb_vwv10)) << 32);
 
 #else /* !LARGE_SMB_OFF_T */
 
@@ -2948,10 +2940,10 @@
 		 * Ensure we haven't been sent a >32 bit offset.
 		 */
 
-		if(IVAL(inbuf,smb_vwv10) != 0) {
+		if(IVAL(req->inbuf,smb_vwv10) != 0) {
 			DEBUG(0,("reply_read_and_X - large offset (%x << 32) "
 				 "used and we don't support 64 bit offsets.\n",
-				 (unsigned int)IVAL(inbuf,smb_vwv10) ));
+				 (unsigned int)IVAL(req->inbuf,smb_vwv10) ));
 			END_PROFILE(SMBreadX);
 			reply_doserror(req, ERRDOS, ERRbadaccess);
 			return;
@@ -2968,6 +2960,14 @@
 		return;
 	}
 
+	if (!reply_prep_legacy(req, &inbuf, &outbuf, &length, &bufsize)) {
+		reply_nterror(req, NT_STATUS_NO_MEMORY);
+		END_PROFILE(SMBreadX);
+		return;
+	}
+
+	set_message(inbuf,outbuf,12,0,True);
+
 	if (!big_readX
 	    && schedule_aio_read_and_X(conn, inbuf, outbuf, length, bufsize,
 				       fsp, startpos, smb_maxcnt)) {