r884: convert samba4 to use [u]int32_t instead of [u]int32

metze
(This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095)

21 files changed, 131 insertions, 131 deletions

diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 1a708ac055..5febf873bd 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -31,8 +31,8 @@
 */
 static NTSTATUS unicode_open(struct cli_tree *tree,
 			     TALLOC_CTX *mem_ctx,
-			     uint32 open_disposition, 
-			     const uint32 *u_name, 
+			     uint32_t open_disposition, 
+			     const uint32_t *u_name, 
 			     size_t u_name_len)
 {
 	union smb_open io;
@@ -92,8 +92,8 @@ static NTSTATUS unicode_open(struct cli_tree *tree,
 */
 static BOOL test_composed(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 {
-	const uint32 name1[] = {0x61, 0x308};
-	const uint32 name2[] = {0xe4};
+	const uint32_t name1[] = {0x61, 0x308};
+	const uint32_t name2[] = {0xe4};
 	NTSTATUS status1, status2;
 
 	printf("Testing composite character (a umlaut)\n");
@@ -121,8 +121,8 @@ static BOOL test_composed(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 */
 static BOOL test_diacritical(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 {
-	const uint32 name1[] = {0x308};
-	const uint32 name2[] = {0x308, 0x308};
+	const uint32_t name1[] = {0x308};
+	const uint32_t name2[] = {0x308, 0x308};
 	NTSTATUS status1, status2;
 
 	printf("Testing naked diacritical (umlaut)\n");
@@ -152,9 +152,9 @@ static BOOL test_diacritical(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 */
 static BOOL test_surrogate(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 {
-	const uint32 name1[] = {0xd800};
-	const uint32 name2[] = {0xdc00};
-	const uint32 name3[] = {0xd800, 0xdc00};
+	const uint32_t name1[] = {0xd800};
+	const uint32_t name2[] = {0xdc00};
+	const uint32_t name3[] = {0xd800, 0xdc00};
 	NTSTATUS status;
 
 	printf("Testing partial surrogate\n");
@@ -191,9 +191,9 @@ static BOOL test_surrogate(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 */
 static BOOL test_widea(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 {
-	const uint32 name1[] = {'a'};
-	const uint32 name2[] = {0xff41};
-	const uint32 name3[] = {0xff21};
+	const uint32_t name1[] = {'a'};
+	const uint32_t name2[] = {0xff41};
+	const uint32_t name3[] = {0xff21};
 	NTSTATUS status;
 
 	printf("Testing wide-a\n");
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 5c5bdf5955..1f33257e6a 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -445,7 +445,7 @@ static const char *gen_pattern(void)
 /*
   generate a bitmask
 */
-static uint32 gen_bits_mask(uint_t mask)
+static uint32_t gen_bits_mask(uint_t mask)
 {
 	uint_t ret = random();
 	return ret & mask;
@@ -455,7 +455,7 @@ static uint32 gen_bits_mask(uint_t mask)
   generate a bitmask with high probability of the first mask
   and low of the second
 */
-static uint32 gen_bits_mask2(uint32 mask1, uint32 mask2)
+static uint32_t gen_bits_mask2(uint32_t mask1, uint32_t mask2)
 {
 	if (gen_chance(10)) return gen_bits_mask(mask2);
 	return gen_bits_mask(mask1);
@@ -511,7 +511,7 @@ static SMB_OFF_T gen_lock_count(void)
 /*
   generate a ntcreatex flags field
 */
-static uint32 gen_ntcreatex_flags(void)
+static uint32_t gen_ntcreatex_flags(void)
 {
 	if (gen_chance(70)) return NTCREATEX_FLAGS_EXTENDED;
 	return gen_bits_mask2(0x1F, 0xFFFFFFFF);
@@ -520,7 +520,7 @@ static uint32 gen_ntcreatex_flags(void)
 /*
   generate a NT access mask
 */
-static uint32 gen_access_mask(void)
+static uint32_t gen_access_mask(void)
 {
 	if (gen_chance(50)) return SEC_RIGHT_MAXIMUM_ALLOWED;
 	if (gen_chance(20)) return GENERIC_RIGHTS_FILE_ALL_ACCESS;
@@ -530,7 +530,7 @@ static uint32 gen_access_mask(void)
 /*
   generate a ntcreatex create options bitfield
 */
-static uint32 gen_create_options(void)
+static uint32_t gen_create_options(void)
 {
 	if (gen_chance(20)) return gen_bits_mask(0xFFFFFFFF);
 	if (gen_chance(50)) return 0;
@@ -540,7 +540,7 @@ static uint32 gen_create_options(void)
 /*
   generate a ntcreatex open disposition
 */
-static uint32 gen_open_disp(void)
+static uint32_t gen_open_disp(void)
 {
 	if (gen_chance(10)) return gen_bits_mask(0xFFFFFFFF);
 	return gen_int_range(0, 5);
@@ -577,7 +577,7 @@ static uint16 gen_openx_func(void)
 /*
   generate a file attrib combination
 */
-static uint32 gen_attrib(void)
+static uint32_t gen_attrib(void)
 {
 	if (gen_chance(20)) return gen_bits_mask(0xFFFFFFFF);
 	return gen_bits_mask(FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY);
@@ -605,7 +605,7 @@ static NTTIME gen_nttime(void)
 /*
   generate a milliseconds protocol timeout
 */
-static uint32 gen_timeout(void)
+static uint32_t gen_timeout(void)
 {
 	if (gen_chance(98)) return 0;
 	return random() % 50;
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 99393df7df..e65815fb80 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -211,7 +211,7 @@ void nb_createx(const char *fname,
 		NTSTATUS status)
 {
 	union smb_open io;	
-	uint32 desired_access;
+	uint32_t desired_access;
 	NTSTATUS ret;
 	TALLOC_CTX *mem_ctx;
 	unsigned flags = 0;
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 6b85b243d5..88cadf7b66 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -583,7 +583,7 @@ static BOOL test_ntcreatex(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 	BOOL ret = True;
 	int i;
 	struct {
-		uint32 open_disp;
+		uint32_t open_disp;
 		BOOL with_file;
 		NTSTATUS correct_status;
 	} open_funcs[] = {
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 14f30db97f..26c94b6a09 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -25,7 +25,7 @@ static struct {
 	enum fileinfo_level level;
 	unsigned only_paths:1;
 	unsigned only_handles:1;
-	uint32 capability_mask;
+	uint32_t capability_mask;
 	NTSTATUS fnum_status, fname_status;
 	union smb_fileinfo fnum_finfo, fname_finfo;
 } levels[] = {
@@ -159,7 +159,7 @@ BOOL torture_raw_qfileinfo(int dummy)
 	const char *fname = "\\torture_qfileinfo.txt";
 	NTTIME correct_time;
 	uint64_t correct_size;
-	uint32 correct_attrib;
+	uint32_t correct_attrib;
 	const char *correct_name;
 	BOOL skip_streams = False;
 
@@ -196,7 +196,7 @@ BOOL torture_raw_qfileinfo(int dummy)
 
 	/* check for completely broken levels */
 	for (count=i=0; levels[i].name; i++) {
-		uint32 cap = cli->transport->negotiate.capabilities;
+		uint32_t cap = cli->transport->negotiate.capabilities;
 		/* see if this server claims to support this level */
 		if ((cap & levels[i].capability_mask) != levels[i].capability_mask) {
 			continue;
diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index 347b34b3e2..caa47b43f8 100644
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/torture/raw/qfsinfo.c
@@ -24,7 +24,7 @@
 static struct {
 	const char *name;
 	enum fsinfo_level level;
-	uint32 capability_mask;
+	uint32_t capability_mask;
 	NTSTATUS status;
 	union smb_fsinfo fsinfo;
 } levels[] = {
@@ -131,7 +131,7 @@ BOOL torture_raw_qfsinfo(int dummy)
 
 	/* check for completely broken levels */
 	for (count=i=0; levels[i].name; i++) {
-		uint32 cap = cli->transport->negotiate.capabilities;
+		uint32_t cap = cli->transport->negotiate.capabilities;
 		/* see if this server claims to support this level */
 		if ((cap & levels[i].capability_mask) != levels[i].capability_mask) {
 			continue;
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index ae5d8c34a8..4f4c453bc8 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -70,7 +70,7 @@ static NTSTATUS single_search(struct cli_state *cli,
 static struct {
 	const char *name;
 	enum search_level level;
-	uint32 capability_mask;
+	uint32_t capability_mask;
 	NTSTATUS status;
 	union smb_search_data data;
 } levels[] = {
@@ -123,7 +123,7 @@ static BOOL test_one_file(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 
 	/* call all the levels */
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
-		uint32 cap = cli->transport->negotiate.capabilities;
+		uint32_t cap = cli->transport->negotiate.capabilities;
 
 		printf("testing %s\n", levels[i].name);
 
diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index bd605d7c4f..6b1e558902 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 
-static BOOL test_JobGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32 job_id)
+static BOOL test_JobGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32_t job_id)
 {
 	NTSTATUS status;
 	struct atsvc_JobGetInfo r;
@@ -39,8 +39,8 @@ static BOOL test_JobGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32 j
 	return True;
 }
 
-static BOOL test_JobDel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32 min_job_id,
-			uint32 max_job_id)
+static BOOL test_JobDel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32_t min_job_id,
+			uint32_t max_job_id)
 {
 	NTSTATUS status;
 	struct atsvc_JobDel r;
@@ -64,7 +64,7 @@ static BOOL test_JobEnum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	NTSTATUS status;
 	struct atsvc_JobEnum r;
 	struct atsvc_enum_ctr ctr;
-	uint32 resume_handle = 0, i;
+	uint32_t resume_handle = 0, i;
 	BOOL ret = True;
 
 	printf("\ntesting JobEnum\n");
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 940a42a947..3aa17b6ecc 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -26,7 +26,7 @@ static BOOL test_Exist(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
 	NTSTATUS status;
 	struct dfs_Exist r;
-	uint32 exist = 0;
+	uint32_t exist = 0;
 
 	r.out.exist_flag = &exist;
 
@@ -78,14 +78,14 @@ static BOOL test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16 le
 {
 	NTSTATUS status;
 	struct dfs_Enum r;
-	uint32 total=0;
+	uint32_t total=0;
 	struct dfs_EnumStruct e;
 	struct dfs_Info1 s;
 	struct dfs_EnumArray1 e1;
 	BOOL ret = True;
 	
 	r.in.level = level;
-	r.in.bufsize = (uint32)-1;
+	r.in.bufsize = (uint32_t)-1;
 	r.in.total = &total;
 	r.in.unknown = &total;
 	r.in.info = &e;
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index cdae51393d..37e57d0da7 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -33,7 +33,7 @@ static BOOL test_addone(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	printf("\nTesting AddOne\n");
 
 	for (i=0;i<10;i++) {
-		uint32 n = i;
+		uint32_t n = i;
 		struct echo_AddOne r;
 		r.in.v = &n;
 		r.out.v = &n;
diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c
index 85dfdcae31..31b7d1f5b3 100644
--- a/source4/torture/rpc/eventlog.c
+++ b/source4/torture/rpc/eventlog.c
@@ -50,7 +50,7 @@ static BOOL test_GetNumRecords(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struc
 	return True;
 }
 
-static BOOL test_ReadEventLog(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32 offset)
+static BOOL test_ReadEventLog(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t offset)
 {
 	NTSTATUS status;
 	struct eventlog_ReadEventLog r;
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 679e1dbac8..f3e1c04d29 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -108,7 +108,7 @@ static BOOL test_LookupNames(struct dcerpc_pipe *p,
 	struct lsa_LookupNames r;
 	struct lsa_TransSidArray sids;
 	struct lsa_Name *names;
-	uint32 count = 0;
+	uint32_t count = 0;
 	NTSTATUS status;
 	int i;
 
@@ -150,7 +150,7 @@ static BOOL test_LookupSids(struct dcerpc_pipe *p,
 {
 	struct lsa_LookupSids r;
 	struct lsa_TransNameArray names;
-	uint32 count = sids->num_sids;
+	uint32_t count = sids->num_sids;
 	NTSTATUS status;
 
 	printf("\nTesting LookupSids\n");
@@ -528,7 +528,7 @@ static BOOL test_EnumAccounts(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct lsa_EnumAccounts r;
 	struct lsa_SidArray sids1, sids2;
-	uint32 resume_handle = 0;
+	uint32_t resume_handle = 0;
 	int i;
 
 	printf("\ntesting EnumAccounts\n");
@@ -588,7 +588,7 @@ static BOOL test_EnumPrivs(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct lsa_EnumPrivs r;
 	struct lsa_PrivArray privs1;
-	uint32 resume_handle = 0;
+	uint32_t resume_handle = 0;
 
 	printf("\ntesting EnumPrivs\n");
 
@@ -615,7 +615,7 @@ static BOOL test_EnumTrustDom(struct dcerpc_pipe *p,
 {
 	struct lsa_EnumTrustDom r;
 	NTSTATUS status;
-	uint32 resume_handle = 0;
+	uint32_t resume_handle = 0;
 	struct lsa_DomainList domains;
 
 	printf("\nTesting EnumTrustDom\n");
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 2c4863be90..431502fc5c 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -205,7 +205,7 @@ BOOL torture_rpc_mgmt(int dummy)
 		printf("\nTesting pipe '%s'\n", dcerpc_pipes[i]->name);
 
 		if (b.transport == NCACN_IP_TCP) {
-			uint32 port;
+			uint32_t port;
 			status = dcerpc_epm_map_tcp_port(b.host, 
 							 dcerpc_pipes[i]->uuid,
 							 dcerpc_pipes[i]->if_version,
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index bd7a450f58..e3ff679d97 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -48,8 +48,8 @@ static BOOL join_domain_bdc(TALLOC_CTX *mem_ctx)
 	union samr_UserInfo u;
 	struct policy_handle handle;
 	struct policy_handle domain_handle;
-	uint32 access_granted;
-	uint32 rid;
+	uint32_t access_granted;
+	uint32_t rid;
 	BOOL ret = True;
 	DATA_BLOB session_key;
 	struct samr_Name name;
@@ -288,7 +288,7 @@ static BOOL test_SetupCredentials(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_SetupCredentials2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-				   uint32 negotiate_flags,
+				   uint32_t negotiate_flags,
 				   struct creds_CredentialState *creds)
 {
 	NTSTATUS status;
@@ -1092,7 +1092,7 @@ static BOOL test_DatabaseSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	NTSTATUS status;
 	struct netr_DatabaseSync r;
 	struct creds_CredentialState creds;
-	const uint32 database_ids[] = {0, 1, 2}; 
+	const uint32_t database_ids[] = {0, 1, 2}; 
 	int i;
 	BOOL ret = True;
 
@@ -1102,7 +1102,7 @@ static BOOL test_DatabaseSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 	r.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.computername = TEST_MACHINE_NAME;
-	r.in.preferredmaximumlength = (uint32)-1;
+	r.in.preferredmaximumlength = (uint32_t)-1;
 	ZERO_STRUCT(r.in.return_authenticator);
 
 	for (i=0;i<ARRAY_SIZE(database_ids);i++) {
@@ -1153,7 +1153,7 @@ static BOOL test_DatabaseDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	NTSTATUS status;
 	struct netr_DatabaseDeltas r;
 	struct creds_CredentialState creds;
-	const uint32 database_ids[] = {0, 1, 2}; 
+	const uint32_t database_ids[] = {0, 1, 2}; 
 	int i;
 	BOOL ret = True;
 
@@ -1163,7 +1163,7 @@ static BOOL test_DatabaseDeltas(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 	r.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.computername = TEST_MACHINE_NAME;
-	r.in.preferredmaximumlength = (uint32)-1;
+	r.in.preferredmaximumlength = (uint32_t)-1;
 	ZERO_STRUCT(r.in.return_authenticator);
 
 	for (i=0;i<ARRAY_SIZE(database_ids);i++) {
@@ -1438,7 +1438,7 @@ static BOOL test_DatabaseSync2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	NTSTATUS status;
 	struct netr_DatabaseSync2 r;
 	struct creds_CredentialState creds;
-	const uint32 database_ids[] = {0, 1, 2}; 
+	const uint32_t database_ids[] = {0, 1, 2}; 
 	int i;
 	BOOL ret = True;
 
@@ -1448,7 +1448,7 @@ static BOOL test_DatabaseSync2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
 	r.in.logon_server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
 	r.in.computername = TEST_MACHINE_NAME;
-	r.in.preferredmaximumlength = (uint32)-1;
+	r.in.preferredmaximumlength = (uint32_t)-1;
 	ZERO_STRUCT(r.in.return_authenticator);
 
 	for (i=0;i<ARRAY_SIZE(database_ids);i++) {
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 73d599209c..4b65cc75f9 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -635,7 +635,7 @@ static BOOL test_GetUserPwInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 static NTSTATUS test_LookupName(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 				struct policy_handle *domain_handle, const char *name,
-				uint32 *rid)
+				uint32_t *rid)
 {
 	NTSTATUS status;
 	struct samr_LookupNames n;
@@ -677,7 +677,7 @@ static NTSTATUS test_OpenUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_OpenUser r;
-	uint32 rid;
+	uint32_t rid;
 
 	status = test_LookupName(p, mem_ctx, domain_handle, name, &rid);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -1111,7 +1111,7 @@ BOOL test_DeleteUser_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_DeleteUser d;
 	struct policy_handle acct_handle;
-	uint32 rid;
+	uint32_t rid;
 
 	status = test_LookupName(p, mem_ctx, handle, name, &rid);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -1145,7 +1145,7 @@ static BOOL test_DeleteGroup_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_OpenGroup r;
 	struct samr_DeleteDomainGroup d;
 	struct policy_handle group_handle;
-	uint32 rid;
+	uint32_t rid;
 
 	status = test_LookupName(p, mem_ctx, handle, name, &rid);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -1183,7 +1183,7 @@ static BOOL test_DeleteAlias_byname(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_OpenAlias r;
 	struct samr_DeleteDomAlias d;
 	struct policy_handle alias_handle;
-	uint32 rid;
+	uint32_t rid;
 
 	printf("testing DeleteAlias_byname\n");
 
@@ -1243,7 +1243,7 @@ static BOOL test_CreateAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_CreateDomAlias r;
 	struct samr_Name name;
-	uint32 rid;
+	uint32_t rid;
 	BOOL ret = True;
 
 	init_samr_Name(&name, TEST_ALIASNAME);
@@ -1315,11 +1315,11 @@ static BOOL test_CreateUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	NTSTATUS status;
 	struct samr_CreateUser r;
 	struct samr_QueryUserInfo q;
-	uint32 rid;
+	uint32_t rid;
 	char *password = NULL;
 
 	/* This call creates a 'normal' account - check that it really does */
-	const uint32 acct_flags = ACB_NORMAL;
+	const uint32_t acct_flags = ACB_NORMAL;
 	struct samr_Name name;
 	BOOL ret = True;
 
@@ -1433,13 +1433,13 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_QueryUserInfo q;
 	struct samr_DeleteUser d;
 	struct policy_handle acct_handle;
-	uint32 rid;
+	uint32_t rid;
 	struct samr_Name name;
 	BOOL ret = True;
 	int i;
 
 	struct {
-		uint32 acct_flags;
+		uint32_t acct_flags;
 		const char *account_name;
 		NTSTATUS nt_status;
 	} account_types[] = {
@@ -1461,8 +1461,8 @@ static BOOL test_CreateUser2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	};
 
 	for (i = 0; account_types[i].account_name; i++) {
-		uint32 acct_flags = account_types[i].acct_flags;
-		uint32 access_granted;
+		uint32_t acct_flags = account_types[i].acct_flags;
+		uint32_t access_granted;
 
 		init_samr_Name(&name, account_types[i].account_name);
 
@@ -1700,7 +1700,7 @@ static BOOL test_QueryUserInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_OpenUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-			  struct policy_handle *handle, uint32 rid)
+			  struct policy_handle *handle, uint32_t rid)
 {
 	NTSTATUS status;
 	struct samr_OpenUser r;
@@ -1748,7 +1748,7 @@ static BOOL test_OpenUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_OpenGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-			   struct policy_handle *handle, uint32 rid)
+			   struct policy_handle *handle, uint32_t rid)
 {
 	NTSTATUS status;
 	struct samr_OpenGroup r;
@@ -1784,7 +1784,7 @@ static BOOL test_OpenGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_OpenAlias(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-			   struct policy_handle *handle, uint32 rid)
+			   struct policy_handle *handle, uint32_t rid)
 {
 	NTSTATUS status;
 	struct samr_OpenAlias r;
@@ -1828,7 +1828,7 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_EnumDomainUsers r;
-	uint32 resume_handle=0;
+	uint32_t resume_handle=0;
 	int i;
 	BOOL ret = True;
 	struct samr_LookupNames n;
@@ -1839,7 +1839,7 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.handle = handle;
 	r.in.resume_handle = &resume_handle;
 	r.in.acct_flags = 0;
-	r.in.max_size = (uint32)-1;
+	r.in.max_size = (uint32_t)-1;
 	r.out.resume_handle = &resume_handle;
 
 	status = dcerpc_samr_EnumDomainUsers(p, mem_ctx, &r);
@@ -1879,7 +1879,7 @@ static BOOL test_EnumDomainUsers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	printf("Testing LookupRids\n");
 	lr.in.handle = handle;
 	lr.in.num_rids = r.out.sam->count;
-	lr.in.rids = talloc(mem_ctx, r.out.sam->count * sizeof(uint32));
+	lr.in.rids = talloc(mem_ctx, r.out.sam->count * sizeof(uint32_t));
 	for (i=0;i<r.out.sam->count;i++) {
 		lr.in.rids[i] = r.out.sam->entries[i].idx;
 	}
@@ -1897,7 +1897,7 @@ static BOOL test_EnumDomainGroups(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_EnumDomainGroups r;
-	uint32 resume_handle=0;
+	uint32_t resume_handle=0;
 	int i;
 	BOOL ret = True;
 
@@ -1905,7 +1905,7 @@ static BOOL test_EnumDomainGroups(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	r.in.handle = handle;
 	r.in.resume_handle = &resume_handle;
-	r.in.max_size = (uint32)-1;
+	r.in.max_size = (uint32_t)-1;
 	r.out.resume_handle = &resume_handle;
 
 	status = dcerpc_samr_EnumDomainGroups(p, mem_ctx, &r);
@@ -1932,7 +1932,7 @@ static BOOL test_EnumDomainAliases(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_EnumDomainAliases r;
-	uint32 resume_handle=0;
+	uint32_t resume_handle=0;
 	int i;
 	BOOL ret = True;
 
@@ -1940,7 +1940,7 @@ static BOOL test_EnumDomainAliases(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 	r.in.handle = handle;
 	r.in.resume_handle = &resume_handle;
-	r.in.max_size = (uint32)-1;
+	r.in.max_size = (uint32_t)-1;
 	r.out.resume_handle = &resume_handle;
 
 	status = dcerpc_samr_EnumDomainAliases(p, mem_ctx, &r);
@@ -2058,7 +2058,7 @@ static BOOL test_QueryDisplayInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		r.in.level = levels[i];
 		r.in.start_idx = 0;
 		r.in.max_entries = 1000;
-		r.in.buf_size = (uint32)-1;
+		r.in.buf_size = (uint32_t)-1;
 
 		status = dcerpc_samr_QueryDisplayInfo(p, mem_ctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
@@ -2087,7 +2087,7 @@ static BOOL test_QueryDisplayInfo2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		r.in.level = levels[i];
 		r.in.start_idx = 0;
 		r.in.max_entries = 1000;
-		r.in.buf_size = (uint32)-1;
+		r.in.buf_size = (uint32_t)-1;
 
 		status = dcerpc_samr_QueryDisplayInfo2(p, mem_ctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
@@ -2116,7 +2116,7 @@ static BOOL test_QueryDisplayInfo3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		r.in.level = levels[i];
 		r.in.start_idx = 0;
 		r.in.max_entries = 1000;
-		r.in.buf_size = (uint32)-1;
+		r.in.buf_size = (uint32_t)-1;
 
 		status = dcerpc_samr_QueryDisplayInfo3(p, mem_ctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
@@ -2240,7 +2240,7 @@ static BOOL test_GroupList(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_EnumDomainGroups q1;
 	struct samr_QueryDisplayInfo q2;
 	NTSTATUS status;
-	uint32 resume_handle=0;
+	uint32_t resume_handle=0;
 	int i;
 	BOOL ret = True;
 
@@ -2282,7 +2282,7 @@ static BOOL test_GroupList(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	q2.in.level = 5;
 	q2.in.start_idx = 0;
 	q2.in.max_entries = 5;
-	q2.in.buf_size = (uint32)-1;
+	q2.in.buf_size = (uint32_t)-1;
 
 	status = STATUS_MORE_ENTRIES;
 	while (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
@@ -2436,7 +2436,7 @@ static BOOL test_AddGroupMember(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct samr_QueryGroupMember q;
 	struct samr_SetMemberAttributesOfGroup s;
 	BOOL ret = True;
-	uint32 rid;
+	uint32_t rid;
 
 	status = test_LookupName(p, mem_ctx, domain_handle, TEST_USERNAME, &rid);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -2513,7 +2513,7 @@ static BOOL test_CreateDomainGroup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_CreateDomainGroup r;
-	uint32 rid;
+	uint32_t rid;
 	struct samr_Name name;
 	BOOL ret = True;
 
@@ -2769,13 +2769,13 @@ static BOOL test_EnumDomains(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct samr_EnumDomains r;
-	uint32 resume_handle = 0;
+	uint32_t resume_handle = 0;
 	int i;
 	BOOL ret = True;
 
 	r.in.handle = handle;
 	r.in.resume_handle = &resume_handle;
-	r.in.buf_size = (uint32)-1;
+	r.in.buf_size = (uint32_t)-1;
 	r.out.resume_handle = &resume_handle;
 
 	status = dcerpc_samr_EnumDomains(p, mem_ctx, &r);
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index 944bb4372d..be83b6b6c6 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -165,7 +165,7 @@ BOOL torture_rpc_scanner(int dummy)
 		printf("\nTesting pipe '%s'\n", dcerpc_pipes[i]->name);
 
 		if (b.transport == NCACN_IP_TCP) {
-			uint32 port;
+			uint32_t port;
 			status = dcerpc_epm_map_tcp_port(b.host, 
 							 dcerpc_pipes[i]->uuid,
 							 dcerpc_pipes[i]->if_version,
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index e416c18f90..6e6d325ab0 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -31,7 +31,7 @@ static BOOL test_GetPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	BOOL ret = True;
 	
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
-		uint32 buf_size = 0;
+		uint32_t buf_size = 0;
 		r.in.handle = handle;
 		r.in.level = levels[i];
 		r.in.buffer = NULL;
@@ -92,7 +92,7 @@ static BOOL test_GetForm(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct spoolss_GetForm r;
-	uint32 buf_size;
+	uint32_t buf_size;
 
 	r.in.handle = handle;
 	r.in.formname = formname;
@@ -132,7 +132,7 @@ static BOOL test_EnumForms(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct spoolss_EnumForms r;
-	uint32 buf_size;
+	uint32_t buf_size;
 
 	r.in.handle = handle;
 	r.in.level = 1;
@@ -271,11 +271,11 @@ static BOOL test_AddForm(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_GetJob(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-		  struct policy_handle *handle, uint32 job_id)
+		  struct policy_handle *handle, uint32_t job_id)
 {
 	NTSTATUS status;
 	struct spoolss_GetJob r;
-	uint32 buf_size;
+	uint32_t buf_size;
 
 	r.in.handle = handle;
 	r.in.job_id = job_id;
@@ -311,7 +311,7 @@ static BOOL test_GetJob(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_SetJob(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-		 struct policy_handle *handle, uint32 job_id, uint32 command)
+		 struct policy_handle *handle, uint32_t job_id, uint32_t command)
 {
 	NTSTATUS status;
 	struct spoolss_SetJob r;
@@ -338,7 +338,7 @@ static BOOL test_EnumJobs(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct spoolss_EnumJobs r;
-	uint32 buf_size;
+	uint32_t buf_size;
 
 	r.in.handle = handle;
 	r.in.firstjob = 0;
@@ -408,7 +408,7 @@ static BOOL test_GetPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct spoolss_GetPrinterData r;
-	uint32 buf_size;
+	uint32_t buf_size;
 
 	r.in.handle = handle;
 	r.in.value_name = value_name;
@@ -444,7 +444,7 @@ static BOOL test_GetPrinterDataEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct spoolss_GetPrinterDataEx r;
-	uint32 buf_size;
+	uint32_t buf_size;
 
 	r.in.handle = handle;
 	r.in.key_name = key_name;
@@ -485,7 +485,7 @@ static BOOL test_EnumPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	r.in.enum_index = 0;
 
 	do {
-		uint32 data_size;
+		uint32_t data_size;
 		
 		r.in.value_offered = 0;
 		data_size = 0;
@@ -756,7 +756,7 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	BOOL ret = True;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
-		uint32 buf_size = 0;
+		uint32_t buf_size = 0;
 		union spoolss_PrinterInfo *info;
 		int j;
 
@@ -830,7 +830,7 @@ static BOOL test_GetPrinterDriver2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS status;
 	struct spoolss_GetPrinterDriver2 r;
-	uint32 buf_size;
+	uint32_t buf_size;
 
 	r.in.handle = handle;
 	r.in.architecture = "W32X86";
@@ -872,10 +872,10 @@ static BOOL test_EnumPrinterDrivers(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 	BOOL ret = True;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
-		uint32 buf_size;
+		uint32_t buf_size;
 		char *server;
 		union spoolss_DriverInfo *info;
-		uint32 j;
+		uint32_t j;
 
 		asprintf(&server, "\\\\%s", dcerpc_server_name(p));
 		r.in.server = server;
diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index 8985956f5c..6e98d1905b 100644
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -28,7 +28,7 @@ static BOOL test_NetConnEnum(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct srvsvc_NetConnEnum r;
 	struct srvsvc_NetConnCtr0 c0;
-	uint32 levels[] = {0, 1};
+	uint32_t levels[] = {0, 1};
 	int i;
 	BOOL ret = True;
 
@@ -37,7 +37,7 @@ static BOOL test_NetConnEnum(struct dcerpc_pipe *p,
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
-	r.in.max_buffer = (uint32)-1;
+	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = NULL;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -59,7 +59,7 @@ static BOOL test_NetFileEnum(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct srvsvc_NetFileEnum r;
 	struct srvsvc_NetFileCtr3 c3;
-	uint32 levels[] = {2, 3};
+	uint32_t levels[] = {2, 3};
 	int i;
 	BOOL ret = True;
 
@@ -69,7 +69,7 @@ static BOOL test_NetFileEnum(struct dcerpc_pipe *p,
 	r.in.ctr.ctr3 = &c3;
 	r.in.ctr.ctr3->count = 0;
 	r.in.ctr.ctr3->array = NULL;
-	r.in.max_buffer = (uint32)4096;
+	r.in.max_buffer = (uint32_t)4096;
 	r.in.resume_handle = NULL;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -91,7 +91,7 @@ static BOOL test_NetSessEnum(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct srvsvc_NetSessEnum r;
 	struct srvsvc_NetSessCtr0 c0;
-	uint32 levels[] = {0, 1, 2, 10, 502};
+	uint32_t levels[] = {0, 1, 2, 10, 502};
 	int i;
 	BOOL ret = True;
 
@@ -101,7 +101,7 @@ static BOOL test_NetSessEnum(struct dcerpc_pipe *p,
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
-	r.in.max_buffer = (uint32)-1;
+	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = NULL;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -153,16 +153,16 @@ static BOOL test_NetShareEnumAll(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct srvsvc_NetShareEnumAll r;
 	struct srvsvc_NetShareCtr0 c0;
-	uint32 levels[] = {0, 1, 2, 501, 502, 1004};
+	uint32_t levels[] = {0, 1, 2, 501, 502, 1004};
 	int i;
 	BOOL ret = True;
-	uint32 resume_handle;
+	uint32_t resume_handle;
 
 	ZERO_STRUCT(c0);
 
 	r.in.server_unc = talloc_asprintf(mem_ctx,"\\\\%s",dcerpc_server_name(p));
 	r.in.ctr.ctr0 = &c0;
-	r.in.max_buffer = (uint32)-1;
+	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = &resume_handle;
 	r.out.resume_handle = &resume_handle;
 
@@ -201,10 +201,10 @@ static BOOL test_NetDiskEnum(struct dcerpc_pipe *p,
 {
 	NTSTATUS status;
 	struct srvsvc_NetDiskEnum r;
-	uint32 levels[] = {0};
+	uint32_t levels[] = {0};
 	int i;
 	BOOL ret = True;
-	uint32 resume_handle=0;
+	uint32_t resume_handle=0;
 
 	r.in.server_unc = NULL;
 	r.in.unknown = 0;
@@ -232,7 +232,7 @@ static BOOL test_NetTransportEnum(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct srvsvc_NetTransportEnum r;
 	struct srvsvc_NetTransportCtr0 c0;
-	uint32 levels[] = {0, 1};
+	uint32_t levels[] = {0, 1};
 	int i;
 	BOOL ret = True;
 
@@ -240,7 +240,7 @@ static BOOL test_NetTransportEnum(struct dcerpc_pipe *p,
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
-	r.in.max_buffer = (uint32)-1;
+	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = NULL;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -262,7 +262,7 @@ static BOOL test_NetShareEnum(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct srvsvc_NetShareEnum r;
 	struct srvsvc_NetShareCtr0 c0;
-	uint32 levels[] = {0, 1, 2, 502};
+	uint32_t levels[] = {0, 1, 2, 502};
 	int i;
 	BOOL ret = True;
 
@@ -270,7 +270,7 @@ static BOOL test_NetShareEnum(struct dcerpc_pipe *p,
 	r.in.ctr.ctr0 = &c0;
 	r.in.ctr.ctr0->count = 0;
 	r.in.ctr.ctr0->array = NULL;
-	r.in.max_buffer = (uint32)-1;
+	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = NULL;
 
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index c44237cca6..7fa93aa0c9 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -60,7 +60,7 @@ static BOOL test_CreateKey(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct winreg_CreateKey r;
 	struct policy_handle newhandle;
 	NTSTATUS status;
-	uint32 sec_info = 0;
+	uint32_t sec_info = 0;
 
 	printf("\ntesting CreateKey\n");
 
@@ -267,7 +267,7 @@ static BOOL test_EnumValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	struct winreg_EnumValue r;
     struct winreg_Uint8buf vb;
     struct winreg_EnumValueName vn;
-	uint32 type = 0, requested_len = max_valbufsize, returned_len = 0;
+	uint32_t type = 0, requested_len = max_valbufsize, returned_len = 0;
 	NTSTATUS status;
 
     r.in.handle = handle;
@@ -381,7 +381,7 @@ static BOOL test_OpenHKCR(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_InitiateSystemShutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-			const char *msg, uint32 timeout)
+			const char *msg, uint32_t timeout)
 {
 	struct winreg_InitiateSystemShutdown r;
 	NTSTATUS status;
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 8362c02e3e..b1dc2edfcf 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -56,7 +56,7 @@ static BOOL test_NetWkstaTransportEnum(struct dcerpc_pipe *p,
 	NTSTATUS status;
 	struct wkssvc_NetWkstaTransportEnum r;
 	BOOL ret = True;
-	uint32 resume_handle = 0;
+	uint32_t resume_handle = 0;
 	struct wkssvc_NetWkstaTransportCtr0 ctr0;
 
 	ZERO_STRUCT(ctr0);
@@ -64,7 +64,7 @@ static BOOL test_NetWkstaTransportEnum(struct dcerpc_pipe *p,
 	r.in.server_name = dcerpc_server_name(p);
 	r.in.level = 0;
 	r.in.ctr.ctr0 = &ctr0;
-	r.in.max_buffer = (uint32)-1;
+	r.in.max_buffer = (uint32_t)-1;
 	r.in.resume_handle = &resume_handle;
 	r.out.resume_handle = &resume_handle;
 
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index e1e00cb829..d5e7fbd3b2 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -142,7 +142,7 @@ BOOL torture_close_connection(struct cli_state *c)
 NTSTATUS torture_rpc_connection(struct dcerpc_pipe **p, 
 				const char *pipe_name,
 				const char *pipe_uuid, 
-				uint32 pipe_version)
+				uint32_t pipe_version)
 {
         NTSTATUS status;
 	char *binding = lp_parm_string(-1, "torture", "binding");
@@ -170,11 +170,11 @@ NTSTATUS torture_rpc_close(struct dcerpc_pipe *p)
 
 /* check if the server produced the expected error code */
 static BOOL check_error(int line, struct cli_state *c, 
-			uint8 eclass, uint32 ecode, NTSTATUS nterr)
+			uint8 eclass, uint32_t ecode, NTSTATUS nterr)
 {
         if (cli_is_dos_error(c->tree)) {
                 uint8 class;
-                uint32 num;
+                uint32_t num;
 
                 /* Check DOS error */
 
@@ -206,7 +206,7 @@ static BOOL check_error(int line, struct cli_state *c,
 }
 
 
-static BOOL wait_lock(struct cli_state *c, int fnum, uint32 offset, uint32 len)
+static BOOL wait_lock(struct cli_state *c, int fnum, uint32_t offset, uint32_t len)
 {
 	while (NT_STATUS_IS_ERR(cli_lock(c->tree, fnum, offset, len, -1, WRITE_LOCK))) {
 		if (!check_error(__LINE__, c, ERRDOS, ERRlock, NT_STATUS_LOCK_NOT_GRANTED)) return False;
@@ -330,7 +330,7 @@ static BOOL rw_torture3(struct cli_state *c, const char *lockfname)
 	BOOL correct = True;
 
 	srandom(1);
-	for (i = 0; i < sizeof(buf); i += sizeof(uint32))
+	for (i = 0; i < sizeof(buf); i += sizeof(uint32_t))
 	{
 		SIVAL(buf, i, sys_random());
 	}
@@ -1031,10 +1031,10 @@ static BOOL run_locktest3(int dummy)
 	struct cli_state *cli1, *cli2;
 	const char *fname = "\\lockt3.lck";
 	int fnum1, fnum2, i;
-	uint32 offset;
+	uint32_t offset;
 	BOOL correct = True;
 
-#define NEXT_OFFSET offset += (~(uint32)0) / torture_numops
+#define NEXT_OFFSET offset += (~(uint32_t)0) / torture_numops
 
 	if (!torture_open_connection(&cli1) || !torture_open_connection(&cli2)) {
 		return False;
@@ -3342,7 +3342,7 @@ error_test80:
 }
 
 
-static uint32 open_attrs_table[] = {
+static uint32_t open_attrs_table[] = {
 		FILE_ATTRIBUTE_NORMAL,
 		FILE_ATTRIBUTE_ARCHIVE,
 		FILE_ATTRIBUTE_READONLY,
@@ -3364,9 +3364,9 @@ static uint32 open_attrs_table[] = {
 
 struct trunc_open_results {
 	unsigned int num;
-	uint32 init_attr;
-	uint32 trunc_attr;
-	uint32 result_attr;
+	uint32_t init_attr;
+	uint32_t trunc_attr;
+	uint32_t result_attr;
 };
 
 static struct trunc_open_results attr_results[] = {
@@ -3414,7 +3414,7 @@ static BOOL run_openattrtest(int dummy)
 		return False;
 	}
 	
-	for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32); i++) {
+	for (k = 0, i = 0; i < sizeof(open_attrs_table)/sizeof(uint32_t); i++) {
 		cli_setatr(cli1->tree, fname, 0, 0);
 		cli_unlink(cli1->tree, fname);
 		fnum1 = cli_nt_create_full(cli1->tree, fname, 0, SA_RIGHT_FILE_WRITE_DATA, open_attrs_table[i],