Merge of 64-bit printf warning fixes.

(This used to be commit a6cc763333943bc6e360bb7e78cf9bfb1bc936e8)

6 files changed, 13 insertions, 13 deletions

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 6cf7014846..84339c3a6f 100644
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -707,8 +707,8 @@ static BOOL setup_write_cache(files_struct *fsp, SMB_OFF_T file_size)
 	DO_PROFILE_INC(writecache_allocated_write_caches);
 	allocated_write_caches++;
 
-	DEBUG(10,("setup_write_cache: File %s allocated write cache size %u\n",
-		fsp->fsp_name, wcp->alloc_size ));
+	DEBUG(10,("setup_write_cache: File %s allocated write cache size %lu\n",
+		fsp->fsp_name, (unsigned long)wcp->alloc_size ));
 
 	return True;
 }
@@ -725,7 +725,7 @@ void set_filelen_write_cache(files_struct *fsp, SMB_OFF_T file_size)
 		if (fsp->wcp->data_size != 0) {
 			pstring msg;
 			slprintf(msg, sizeof(msg)-1, "set_filelen_write_cache: size change \
-on file %s with write cache size = %u\n", fsp->fsp_name, fsp->wcp->data_size );
+on file %s with write cache size = %lu\n", fsp->fsp_name, (unsigned long)fsp->wcp->data_size );
 			smb_panic(msg);
 		}
 		fsp->wcp->file_size = file_size;
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index e7d7c20f6b..8158c67a5e 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1957,8 +1957,8 @@ static int call_nt_transact_ioctl(connection_struct *conn, char *inbuf, char *ou
 		DEBUGADD(10,("for SID: %s\n",sid_string_static(&sid)));
 
 		if (!NT_STATUS_IS_OK(sid_to_uid(&sid, &uid))) {
-			DEBUG(0,("sid_to_uid: failed, sid[%s] sid_len[%u]\n",
-				sid_string_static(&sid),sid_len));
+			DEBUG(0,("sid_to_uid: failed, sid[%s] sid_len[%lu]\n",
+				sid_string_static(&sid),(unsigned long)sid_len));
 			uid = (-1);
 		}
 		
@@ -2169,7 +2169,7 @@ static int call_nt_transact_get_user_quota(connection_struct *conn, char *inbuf,
 			sid_len = IVAL(pdata,4);
 
 			if (data_count < 8+sid_len) {
-				DEBUG(0,("TRANSACT_GET_USER_QUOTA_FOR_SID: requires %d >= %d bytes data\n",data_count,8+sid_len));
+				DEBUG(0,("TRANSACT_GET_USER_QUOTA_FOR_SID: requires %d >= %lu bytes data\n",data_count,(unsigned long)(8+sid_len)));
 				return ERROR_DOS(ERRDOS,ERRunknownlevel);				
 			}
 
@@ -2302,7 +2302,7 @@ static int call_nt_transact_set_user_quota(connection_struct *conn, char *inbuf,
 	sid_len = IVAL(pdata,4);
 
 	if (data_count < 40+sid_len) {
-		DEBUG(0,("TRANSACT_SET_USER_QUOTA: requires %d >= %d bytes data\n",data_count,40+sid_len));
+		DEBUG(0,("TRANSACT_SET_USER_QUOTA: requires %d >= %lu bytes data\n",data_count,(unsigned long)40+sid_len));
 		return ERROR_DOS(ERRDOS,ERRunknownlevel);		
 	}
 
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index ac9cf5b8a6..5de9dd56e6 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -226,8 +226,8 @@ static BOOL linux_kernel_oplock_parse(char *msg_start, int msg_len, SMB_INO_T *i
 {
 	/* Ensure that the msg length is correct. */
 	if (msg_len != KERNEL_OPLOCK_BREAK_MSG_LEN) {
-		DEBUG(0,("incorrect length for KERNEL_OPLOCK_BREAK_CMD (was %d, should be %d).\n", 
-			 msg_len, KERNEL_OPLOCK_BREAK_MSG_LEN));
+		DEBUG(0,("incorrect length for KERNEL_OPLOCK_BREAK_CMD (was %d, should be %lu).\n", 
+			 msg_len, (unsigned long)KERNEL_OPLOCK_BREAK_MSG_LEN));
 		return False;
 	}
 
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 95b45fcc99..aa1d25c483 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -460,7 +460,7 @@ static struct pai_val *load_inherited_info(files_struct *fsp)
 		}
 	} while (ret == -1);
 
-	DEBUG(10,("load_inherited_info: ret = %d for file %s\n", ret, fsp->fsp_name));
+	DEBUG(10,("load_inherited_info: ret = %lu for file %s\n", (unsigned long)ret, fsp->fsp_name));
 
 	if (ret == -1) {
 		/* No attribute or not supported. */
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 43ffb82bd7..8a90a15d29 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -637,7 +637,7 @@ static void smb_dump(const char *name, int type, char *data, ssize_t len)
 		if (ret != len)
 			DEBUG(0,("smb_dump: problem: write returned %d\n", (int)ret ));
 		close(fd);
-		DEBUG(0,("created %s len %d\n", fname, len));
+		DEBUG(0,("created %s len %lu\n", fname, (unsigned long)len));
 	}
 }
 
diff --git a/source3/smbd/statcache.c b/source3/smbd/statcache.c
index 76406f208e..d996f5e493 100644
--- a/source3/smbd/statcache.c
+++ b/source3/smbd/statcache.c
@@ -119,8 +119,8 @@ void stat_cache_add( const char *full_orig_name, const char *orig_translated_pat
 
 	if (original_path_length != translated_path_length) {
 		if (original_path_length < translated_path_length) {
-			DEBUG(0, ("OOPS - tried to store stat cache entry for weird length paths [%s] %u and [%s] %u)!\n",
-						original_path, original_path_length, translated_path, translated_path_length));
+			DEBUG(0, ("OOPS - tried to store stat cache entry for weird length paths [%s] %lu and [%s] %lu)!\n",
+				  original_path, (unsigned long)original_path_length, translated_path, (unsigned long)translated_path_length));
 			SAFE_FREE(original_path);
 			SAFE_FREE(translated_path);
 			return;