r3237: - allow for readx calls larger than 64k

- combine setattre and standard levels in setfileinfo, as they use the
  same structure
(This used to be commit e9aa1f789955533aca4fe43d5d74ffa1e8d1300b)

1 files changed, 4 insertions, 15 deletions

diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index d7fb8ec6b3..771dce8803 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -726,7 +726,8 @@ union smb_setfileinfo {
 		} 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 @@ union smb_setfileinfo {
 			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 @@ union smb_read {
 			uint16_t fnum;
 			uint64_t offset;
 			uint16_t mincnt;
-			uint16_t maxcnt;
+			uint32_t maxcnt;
 			uint16_t remaining;
 		} in;
 		struct {