svn commit: samba r4212 - in branches/SAMBA_3_0/source: libsmb smbd

[jra at samba.org]

Author: jra
Date: 2004-12-15 01:25:24 +0000 (Wed, 15 Dec 2004)
New Revision: 4212

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

Log:
Ensure we only look at the bottom bit of large_readx.
Set the 14 word version of write if size > 0xffff as
well as 64-bit offset.
Jeremy.

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


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clireadwrite.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clireadwrite.c	2004-12-15 01:25:20 UTC (rev 4211)
+++ branches/SAMBA_3_0/source/libsmb/clireadwrite.c	2004-12-15 01:25:24 UTC (rev 4212)
@@ -259,7 +259,7 @@
 			    size_t size, int i)
 {
 	char *p;
-	BOOL bigoffset = False;
+	BOOL large_writex = False;
 
 	if (size > cli->bufsize) {
 		cli->outbuf = SMB_REALLOC(cli->outbuf, size + 1024);
@@ -272,10 +272,11 @@
 	memset(cli->outbuf,'\0',smb_size);
 	memset(cli->inbuf,'\0',smb_size);
 
-	if ((SMB_BIG_UINT)offset >> 32) 
-		bigoffset = True;
+	if (((SMB_BIG_UINT)offset >> 32) || (size > 0xFFFF)) {
+		large_writex = True;
+	}
 
-	if (bigoffset)
+	if (large_writex)
 		set_message(cli->outbuf,14,0,True);
 	else
 		set_message(cli->outbuf,12,0,True);
@@ -303,7 +304,7 @@
 	SSVAL(cli->outbuf,smb_vwv11,
 	      smb_buf(cli->outbuf) - smb_base(cli->outbuf));
 
-	if (bigoffset)
+	if (large_writex)
 		SIVAL(cli->outbuf,smb_vwv12,(offset>>32) & 0xffffffff);
 	
 	p = smb_base(cli->outbuf) + SVAL(cli->outbuf,smb_vwv11);

Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2004-12-15 01:25:20 UTC (rev 4211)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2004-12-15 01:25:24 UTC (rev 4212)
@@ -2239,7 +2239,9 @@
 	set_message(outbuf,12,0,True);
 
 	if (global_client_caps & CAP_LARGE_READX) {
-		smb_maxcnt |= ((((size_t)SVAL(inbuf,smb_vwv7)) & 1 )<<16);
+		if (SVAL(inbuf,smb_vwv7) == 1) {
+			smb_maxcnt |= (1<<16);
+		}
 		if (smb_maxcnt > BUFFER_SIZE) {
 			DEBUG(0,("reply_read_and_X - read too large (%u) for reply buffer %u\n",
 				(unsigned int)smb_maxcnt, (unsigned int)BUFFER_SIZE));