(merge from 3.0)

I think this was tpot's originally:

Fix format types for 64 bit systems.

Andrew Bartlett
(This used to be commit 256b2da7c96e8313f4f98ce700fc7634eaccb72b)

3 files changed, 5 insertions, 4 deletions

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index cd917f67cd..96e52964b4 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -2080,8 +2080,8 @@ enum {
 			if ((challenge_len = strhex_to_str(challenge, 
 							   strlen(hex_challenge), 
 							   hex_challenge)) != 8) {
-				x_fprintf(x_stderr, "hex decode of %s failed (only got %u bytes)!\n", 
-					hex_challenge, challenge_len);
+				x_fprintf(x_stderr, "hex decode of %s failed (only got %lu bytes)!\n", 
+					hex_challenge, (unsigned long)challenge_len);
 				exit(1);
 			}
 			opt_challenge = data_blob(challenge, challenge_len);
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 190627e2a5..eae1f97b58 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -203,7 +203,8 @@ static void profilelevel_cb(int msg_type, pid_t pid, void *buf, size_t len)
 	num_replies++;
 
 	if (len != sizeof(int)) {
-		fprintf(stderr, "invalid message length %d returned\n", len);
+		fprintf(stderr, "invalid message length %ld returned\n", 
+			(unsigned long)len);
 		return;
 	}
 
diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 1a0d639f02..5d67c8fc7c 100644
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -47,7 +47,7 @@ static void save_file(const char *fname, void *packet, size_t length)
 		return;
 	}
 	close(fd);
-	printf("Wrote %d bytes to %s\n", length, fname);
+	printf("Wrote %ld bytes to %s\n", (unsigned long)length, fname);
 }
 
 static void filter_reply(char *buf)