svn commit: samba r3237 - in branches/SAMBA_4_0/source: include libcli/raw

[tridge at samba.org]

Author: tridge
Date: 2004-10-26 05:34:35 +0000 (Tue, 26 Oct 2004)
New Revision: 3237

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=3237&nolog=1

Log:
- allow for readx calls larger than 64k 

- combine setattre and standard levels in setfileinfo, as they use the
  same structure



Modified:
   branches/SAMBA_4_0/source/include/smb_interfaces.h
   branches/SAMBA_4_0/source/libcli/raw/rawreadwrite.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/smb_interfaces.h
===================================================================
--- branches/SAMBA_4_0/source/include/smb_interfaces.h	2004-10-26 05:33:23 UTC (rev 3236)
+++ branches/SAMBA_4_0/source/include/smb_interfaces.h	2004-10-26 05:34:35 UTC (rev 3237)
@@ -726,7 +726,8 @@
 		} in;
 	} setattr;
 
-	/* RAW_SFILEINFO_SETATTRE (SMBsetattrE) interface - only via setfileinfo() */
+	/* RAW_SFILEINFO_SETATTRE (SMBsetattrE) interface - only via setfileinfo() 
+	   also RAW_SFILEINFO_STANDARD */
 	struct {
 		enum smb_setfileinfo_level level;
 		union setfileinfo_file file;
@@ -735,22 +736,10 @@
 			time_t create_time;
 			time_t access_time;
 			time_t write_time;
-		} in;
-	} setattre;
-
-	
-	/* RAW_SFILEINFO_STANDARD interface */
-	struct {
-		enum smb_setfileinfo_level level;
-		union setfileinfo_file file;
-		struct {
-			time_t create_time;
-			time_t access_time;
-			time_t write_time;
 			/* notice that size, alloc_size and attrib are not settable,
 			   unlike the corresponding qfileinfo level */
 		} in;
-	} standard;
+	} setattre, standard;
 
 	/* RAW_SFILEINFO_EA_SET interface */
 	struct {
@@ -1248,7 +1237,7 @@
 			uint16_t fnum;
 			uint64_t offset;
 			uint16_t mincnt;
-			uint16_t maxcnt;
+			uint32_t maxcnt;
 			uint16_t remaining;
 		} in;
 		struct {

Modified: branches/SAMBA_4_0/source/libcli/raw/rawreadwrite.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawreadwrite.c	2004-10-26 05:33:23 UTC (rev 3236)
+++ branches/SAMBA_4_0/source/libcli/raw/rawreadwrite.c	2004-10-26 05:34:35 UTC (rev 3237)
@@ -77,9 +77,9 @@
 		SSVAL(req->out.vwv, VWV(1), 0);
 		SSVAL(req->out.vwv, VWV(2), parms->readx.in.fnum);
 		SIVAL(req->out.vwv, VWV(3), parms->readx.in.offset);
-		SSVAL(req->out.vwv, VWV(5), parms->readx.in.maxcnt);
+		SSVAL(req->out.vwv, VWV(5), parms->readx.in.maxcnt & 0xFFFF);
 		SSVAL(req->out.vwv, VWV(6), parms->readx.in.mincnt);
-		SIVAL(req->out.vwv, VWV(7), 0); /* reserved */
+		SIVAL(req->out.vwv, VWV(7), parms->readx.in.maxcnt >> 16);
 		SSVAL(req->out.vwv, VWV(9), parms->readx.in.remaining);
 		if (bigoffset) {
 			SIVAL(req->out.vwv, VWV(10),parms->readx.in.offset>>32);