Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel

1 files changed, 57 insertions, 57 deletions

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 124171ae10..00fee0d34d 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -47,9 +47,9 @@ static char *store_file_unix_basic_info2(connection_struct *conn,
  Only do this for Windows clients.
 ********************************************************************/
 
-SMB_BIG_UINT smb_roundup(connection_struct *conn, SMB_BIG_UINT val)
+uint64_t smb_roundup(connection_struct *conn, uint64_t val)
 {
-	SMB_BIG_UINT rval = lp_allocation_roundup_size(SNUM(conn));
+	uint64_t rval = lp_allocation_roundup_size(SNUM(conn));
 
 	/* Only roundup for Windows clients. */
 	enum remote_arch_types ra_type = get_remote_arch();
@@ -64,18 +64,18 @@ SMB_BIG_UINT smb_roundup(connection_struct *conn, SMB_BIG_UINT val)
  account sparse files.
 ********************************************************************/
 
-SMB_BIG_UINT get_allocation_size(connection_struct *conn, files_struct *fsp, const SMB_STRUCT_STAT *sbuf)
+uint64_t get_allocation_size(connection_struct *conn, files_struct *fsp, const SMB_STRUCT_STAT *sbuf)
 {
-	SMB_BIG_UINT ret;
+	uint64_t ret;
 
 	if(S_ISDIR(sbuf->st_mode)) {
 		return 0;
 	}
 
 #if defined(HAVE_STAT_ST_BLOCKS) && defined(STAT_ST_BLOCKSIZE)
-	ret = (SMB_BIG_UINT)STAT_ST_BLOCKSIZE * (SMB_BIG_UINT)sbuf->st_blocks;
+	ret = (uint64_t)STAT_ST_BLOCKSIZE * (uint64_t)sbuf->st_blocks;
 #else
-	ret = (SMB_BIG_UINT)get_file_size(*sbuf);
+	ret = (uint64_t)get_file_size(*sbuf);
 #endif
 
 	if (fsp && fsp->initial_allocation_size)
@@ -1264,7 +1264,7 @@ static bool get_lanman2_dir_entry(TALLOC_CTX *ctx,
 	long prev_dirpos=0;
 	uint32 mode=0;
 	SMB_OFF_T file_size = 0;
-	SMB_BIG_UINT allocation_size = 0;
+	uint64_t allocation_size = 0;
 	uint32 len;
 	struct timespec mdate_ts, adate_ts, create_date_ts;
 	time_t mdate = (time_t)0, adate = (time_t)0, create_date = (time_t)0;
@@ -2613,22 +2613,22 @@ static void call_trans2qfsinfo(connection_struct *conn,
 	switch (info_level) {
 		case SMB_INFO_ALLOCATION:
 		{
-			SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
+			uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
 			data_len = 18;
-			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
 				reply_unixerror(req, ERRHRD, ERRgeneral);
 				return;
 			}
 
 			block_size = lp_block_size(snum);
 			if (bsize < block_size) {
-				SMB_BIG_UINT factor = block_size/bsize;
+				uint64_t factor = block_size/bsize;
 				bsize = block_size;
 				dsize /= factor;
 				dfree /= factor;
 			}
 			if (bsize > block_size) {
-				SMB_BIG_UINT factor = bsize/block_size;
+				uint64_t factor = bsize/block_size;
 				bsize = block_size;
 				dsize *= factor;
 				dfree *= factor;
@@ -2733,21 +2733,21 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_dev, (unsi
 		case SMB_QUERY_FS_SIZE_INFO:
 		case SMB_FS_SIZE_INFORMATION:
 		{
-			SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
+			uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
 			data_len = 24;
-			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
 				reply_unixerror(req, ERRHRD, ERRgeneral);
 				return;
 			}
 			block_size = lp_block_size(snum);
 			if (bsize < block_size) {
-				SMB_BIG_UINT factor = block_size/bsize;
+				uint64_t factor = block_size/bsize;
 				bsize = block_size;
 				dsize /= factor;
 				dfree /= factor;
 			}
 			if (bsize > block_size) {
-				SMB_BIG_UINT factor = bsize/block_size;
+				uint64_t factor = bsize/block_size;
 				bsize = block_size;
 				dsize *= factor;
 				dfree *= factor;
@@ -2766,21 +2766,21 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
 
 		case SMB_FS_FULL_SIZE_INFORMATION:
 		{
-			SMB_BIG_UINT dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
+			uint64_t dfree,dsize,bsize,block_size,sectors_per_unit,bytes_per_sector;
 			data_len = 32;
-			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (SMB_BIG_UINT)-1) {
+			if (get_dfree_info(conn,".",False,&bsize,&dfree,&dsize) == (uint64_t)-1) {
 				reply_unixerror(req, ERRHRD, ERRgeneral);
 				return;
 			}
 			block_size = lp_block_size(snum);
 			if (bsize < block_size) {
-				SMB_BIG_UINT factor = block_size/bsize;
+				uint64_t factor = block_size/bsize;
 				bsize = block_size;
 				dsize /= factor;
 				dfree /= factor;
 			}
 			if (bsize > block_size) {
-				SMB_BIG_UINT factor = bsize/block_size;
+				uint64_t factor = bsize/block_size;
 				bsize = block_size;
 				dsize *= factor;
 				dfree *= factor;
@@ -2811,8 +2811,8 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
 		 * what we have to send --metze:
 		 *
 		 * Unknown1: 		24 NULL bytes
-		 * Soft Quota Treshold: 8 bytes seems like SMB_BIG_UINT or so
-		 * Hard Quota Limit:	8 bytes seems like SMB_BIG_UINT or so
+		 * Soft Quota Treshold: 8 bytes seems like uint64_t or so
+		 * Hard Quota Limit:	8 bytes seems like uint64_t or so
 		 * Quota Flags:		2 byte :
 		 * Unknown3:		6 NULL bytes
 		 *
@@ -2860,9 +2860,9 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
 			DEBUG(10,("SMB_FS_QUOTA_INFORMATION: for service [%s]\n",lp_servicename(SNUM(conn))));		
 		
 			/* Unknown1 24 NULL bytes*/
-			SBIG_UINT(pdata,0,(SMB_BIG_UINT)0);
-			SBIG_UINT(pdata,8,(SMB_BIG_UINT)0);
-			SBIG_UINT(pdata,16,(SMB_BIG_UINT)0);
+			SBIG_UINT(pdata,0,(uint64_t)0);
+			SBIG_UINT(pdata,8,(uint64_t)0);
+			SBIG_UINT(pdata,16,(uint64_t)0);
 		
 			/* Default Soft Quota 8 bytes */
 			SBIG_UINT(pdata,24,quotas.softlim);
@@ -2935,7 +2935,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
 			/* We have POSIX ACLs, pathname, encryption, 
 			 * large read/write, and locking capability. */
 
-			SBIG_UINT(pdata,4,((SMB_BIG_UINT)(
+			SBIG_UINT(pdata,4,((uint64_t)(
 					CIFS_UNIX_POSIX_ACLS_CAP|
 					CIFS_UNIX_POSIX_PATHNAMES_CAP|
 					CIFS_UNIX_FCNTL_LOCKS_CAP|
@@ -3037,9 +3037,9 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
 			SIVAL(pdata, 0, flags);
 			SIVAL(pdata, 4, SMB_WHOAMI_MASK);
 			SBIG_UINT(pdata, 8,
-				  (SMB_BIG_UINT)conn->server_info->utok.uid);
+				  (uint64_t)conn->server_info->utok.uid);
 			SBIG_UINT(pdata, 16,
-				  (SMB_BIG_UINT)conn->server_info->utok.gid);
+				  (uint64_t)conn->server_info->utok.gid);
 
 
 			if (data_len >= max_data_bytes) {
@@ -3078,7 +3078,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
 			/* GID list */
 			for (i = 0; i < conn->server_info->utok.ngroups; ++i) {
 				SBIG_UINT(pdata, data_len,
-					  (SMB_BIG_UINT)conn->server_info->utok.groups[i]);
+					  (uint64_t)conn->server_info->utok.groups[i]);
 				data_len += 8;
 			}
 
@@ -3319,10 +3319,10 @@ cap_low = 0x%x, cap_high = 0x%x\n",
 			
 				/* unknown_1 24 NULL bytes in pdata*/
 		
-				/* the soft quotas 8 bytes (SMB_BIG_UINT)*/
-				quotas.softlim = (SMB_BIG_UINT)IVAL(pdata,24);
+				/* the soft quotas 8 bytes (uint64_t)*/
+				quotas.softlim = (uint64_t)IVAL(pdata,24);
 #ifdef LARGE_SMB_OFF_T
-				quotas.softlim |= (((SMB_BIG_UINT)IVAL(pdata,28)) << 32);
+				quotas.softlim |= (((uint64_t)IVAL(pdata,28)) << 32);
 #else /* LARGE_SMB_OFF_T */
 				if ((IVAL(pdata,28) != 0)&&
 					((quotas.softlim != 0xFFFFFFFF)||
@@ -3335,10 +3335,10 @@ cap_low = 0x%x, cap_high = 0x%x\n",
 				}
 #endif /* LARGE_SMB_OFF_T */
 		
-				/* the hard quotas 8 bytes (SMB_BIG_UINT)*/
-				quotas.hardlim = (SMB_BIG_UINT)IVAL(pdata,32);
+				/* the hard quotas 8 bytes (uint64_t)*/
+				quotas.hardlim = (uint64_t)IVAL(pdata,32);
 #ifdef LARGE_SMB_OFF_T
-				quotas.hardlim |= (((SMB_BIG_UINT)IVAL(pdata,36)) << 32);
+				quotas.hardlim |= (((uint64_t)IVAL(pdata,36)) << 32);
 #else /* LARGE_SMB_OFF_T */
 				if ((IVAL(pdata,36) != 0)&&
 					((quotas.hardlim != 0xFFFFFFFF)||
@@ -3828,7 +3828,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
 	int mode=0;
 	int nlink;
 	SMB_OFF_T file_size=0;
-	SMB_BIG_UINT allocation_size=0;
+	uint64_t allocation_size=0;
 	unsigned int data_size = 0;
 	unsigned int param_size = 2;
 	SMB_STRUCT_STAT sbuf;
@@ -4682,8 +4682,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 		case SMB_QUERY_POSIX_LOCK:
 		{
 			NTSTATUS status = NT_STATUS_INVALID_LEVEL;
-			SMB_BIG_UINT count;
-			SMB_BIG_UINT offset;
+			uint64_t count;
+			uint64_t offset;
 			uint32 lock_pid;
 			enum brl_type lock_type;
 
@@ -4711,13 +4711,13 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 
 			lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
 #if defined(HAVE_LONGLONG)
-			offset = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
-					((SMB_BIG_UINT) IVAL(pdata,POSIX_LOCK_START_OFFSET));
-			count = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
-					((SMB_BIG_UINT) IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
+			offset = (((uint64_t) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
+					((uint64_t) IVAL(pdata,POSIX_LOCK_START_OFFSET));
+			count = (((uint64_t) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
+					((uint64_t) IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
 #else /* HAVE_LONGLONG */
-			offset = (SMB_BIG_UINT)IVAL(pdata,POSIX_LOCK_START_OFFSET);
-			count = (SMB_BIG_UINT)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
+			offset = (uint64_t)IVAL(pdata,POSIX_LOCK_START_OFFSET);
+			count = (uint64_t)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
 #endif /* HAVE_LONGLONG */
 
 			status = query_lock(fsp,
@@ -5123,7 +5123,7 @@ static NTSTATUS smb_file_position_information(connection_struct *conn,
 				int total_data,
 				files_struct *fsp)
 {
-	SMB_BIG_UINT position_information;
+	uint64_t position_information;
 
 	if (total_data < 8) {
 		return NT_STATUS_INVALID_PARAMETER;
@@ -5134,9 +5134,9 @@ static NTSTATUS smb_file_position_information(connection_struct *conn,
 		return NT_STATUS_OK;
 	}
 
-	position_information = (SMB_BIG_UINT)IVAL(pdata,0);
+	position_information = (uint64_t)IVAL(pdata,0);
 #ifdef LARGE_SMB_OFF_T
-	position_information |= (((SMB_BIG_UINT)IVAL(pdata,4)) << 32);
+	position_information |= (((uint64_t)IVAL(pdata,4)) << 32);
 #else /* LARGE_SMB_OFF_T */
 	if (IVAL(pdata,4) != 0) {
 		/* more than 32 bits? */
@@ -5475,8 +5475,8 @@ static NTSTATUS smb_set_posix_lock(connection_struct *conn,
 				int total_data,
 				files_struct *fsp)
 {
-	SMB_BIG_UINT count;
-	SMB_BIG_UINT offset;
+	uint64_t count;
+	uint64_t offset;
 	uint32 lock_pid;
 	bool blocking_lock = False;
 	enum brl_type lock_type;
@@ -5523,13 +5523,13 @@ static NTSTATUS smb_set_posix_lock(connection_struct *conn,
 
 	lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET);
 #if defined(HAVE_LONGLONG)
-	offset = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
-			((SMB_BIG_UINT) IVAL(pdata,POSIX_LOCK_START_OFFSET));
-	count = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
-			((SMB_BIG_UINT) IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
+	offset = (((uint64_t) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) |
+			((uint64_t) IVAL(pdata,POSIX_LOCK_START_OFFSET));
+	count = (((uint64_t) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) |
+			((uint64_t) IVAL(pdata,POSIX_LOCK_LEN_OFFSET));
 #else /* HAVE_LONGLONG */
-	offset = (SMB_BIG_UINT)IVAL(pdata,POSIX_LOCK_START_OFFSET);
-	count = (SMB_BIG_UINT)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
+	offset = (uint64_t)IVAL(pdata,POSIX_LOCK_START_OFFSET);
+	count = (uint64_t)IVAL(pdata,POSIX_LOCK_LEN_OFFSET);
 #endif /* HAVE_LONGLONG */
 
 	DEBUG(10,("smb_set_posix_lock: file %s, lock_type = %u,"
@@ -5702,7 +5702,7 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn,
 					const char *fname,
 					SMB_STRUCT_STAT *psbuf)
 {
-	SMB_BIG_UINT allocation_size = 0;
+	uint64_t allocation_size = 0;
 	NTSTATUS status = NT_STATUS_OK;
 	files_struct *new_fsp = NULL;
 
@@ -5714,9 +5714,9 @@ static NTSTATUS smb_set_file_allocation_info(connection_struct *conn,
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	allocation_size = (SMB_BIG_UINT)IVAL(pdata,0);
+	allocation_size = (uint64_t)IVAL(pdata,0);
 #ifdef LARGE_SMB_OFF_T
-	allocation_size |= (((SMB_BIG_UINT)IVAL(pdata,4)) << 32);
+	allocation_size |= (((uint64_t)IVAL(pdata,4)) << 32);
 #else /* LARGE_SMB_OFF_T */
 	if (IVAL(pdata,4) != 0) {
 		/* more than 32 bits? */