s3: utils: Convert all uses of uint32/16/8 to _t.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu May  7 04:53:39 CEST 2015 on sn-devel-104

26 files changed, 210 insertions, 210 deletions

diff --git a/source3/utils/eventlogadm.c b/source3/utils/eventlogadm.c
index 4c368b4e4b3..5ef091a9ae3 100644
--- a/source3/utils/eventlogadm.c
+++ b/source3/utils/eventlogadm.c
@@ -91,7 +91,7 @@ static bool eventlog_add_source( const char *eventlog, const char *sourcename,
 	const char *hive_name, *relpath;
 	enum winreg_CreateAction action;
 	struct registry_value *value;
-	static const uint32 ACCESS = REG_KEY_READ | REG_KEY_WRITE;
+	static const uint32_t ACCESS = REG_KEY_READ | REG_KEY_WRITE;
 	bool ret = false;
 
 	if (!elogs) {
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 866abfd07fb..d565a24e606 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -74,47 +74,47 @@ int hexformat = 0;
 
 /* tcpdump file format */
 struct tcpdump_file_header {
-	uint32 magic;
-	uint16 major;
-	uint16 minor;
+	uint32_t magic;
+	uint16_t major;
+	uint16_t minor;
 	int32 zone;
-	uint32 sigfigs;
-	uint32 snaplen;
-	uint32 linktype;
+	uint32_t sigfigs;
+	uint32_t snaplen;
+	uint32_t linktype;
 };
 
 struct tcpdump_packet {
 	struct timeval ts;
-	uint32 caplen;
-	uint32 len;
+	uint32_t caplen;
+	uint32_t len;
 };
 
 typedef struct {
-    uint8  ver_hdrlen;
-    uint8  dscp;
-    uint16 packet_length;
-    uint16 identification;
-    uint8  flags;
-    uint8  fragment;
-    uint8  ttl;
-    uint8  protocol;
-    uint16 hdr_checksum;
-    uint32 src_addr;
-    uint32 dest_addr;
+    uint8_t  ver_hdrlen;
+    uint8_t  dscp;
+    uint16_t packet_length;
+    uint16_t identification;
+    uint8_t  flags;
+    uint8_t  fragment;
+    uint8_t  ttl;
+    uint8_t  protocol;
+    uint16_t hdr_checksum;
+    uint32_t src_addr;
+    uint32_t dest_addr;
 } hdr_ip_t;
 
 static hdr_ip_t HDR_IP = {0x45, 0, 0, 0x3412, 0, 0, 0xff, 6, 0, 0x01010101, 0x02020202};
 
 typedef struct {
-    uint16 source_port;
-    uint16 dest_port;
-    uint32 seq_num;
-    uint32 ack_num;
-    uint8  hdr_length;
-    uint8  flags;
-    uint16 window;
-    uint16 checksum;
-    uint16 urg;
+    uint16_t source_port;
+    uint16_t dest_port;
+    uint32_t seq_num;
+    uint32_t ack_num;
+    uint8_t  hdr_length;
+    uint8_t  flags;
+    uint16_t window;
+    uint16_t checksum;
+    uint16_t urg;
 } hdr_tcp_t;
 
 static hdr_tcp_t HDR_TCP = {139, 139, 0, 0, 0x50, 0, 0, 0, 0};
diff --git a/source3/utils/net.c b/source3/utils/net.c
index f53e627a20b..ceaf5da939a 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -370,10 +370,10 @@ static int net_getdomainsid(struct net_context *c, int argc, const char **argv)
 }
 
 static bool search_maxrid(struct pdb_search *search, const char *type,
-			  uint32 *max_rid)
+			  uint32_t *max_rid)
 {
 	struct samr_displayentry *entries;
-	uint32 i, num_entries;
+	uint32_t i, num_entries;
 
 	if (search == NULL) {
 		d_fprintf(stderr, _("get_maxrid: Could not search %s\n"), type);
@@ -387,9 +387,9 @@ static bool search_maxrid(struct pdb_search *search, const char *type,
 	return true;
 }
 
-static uint32 get_maxrid(void)
+static uint32_t get_maxrid(void)
 {
-	uint32 max_rid = 0;
+	uint32_t max_rid = 0;
 
 	if (!search_maxrid(pdb_search_users(talloc_tos(), 0), "users", &max_rid))
 		return 0;
@@ -407,7 +407,7 @@ static uint32 get_maxrid(void)
 
 static int net_maxrid(struct net_context *c, int argc, const char **argv)
 {
-	uint32 rid;
+	uint32_t rid;
 
 	if (argc != 0) {
 	        d_fprintf(stderr, "%s net maxrid\n", _("Usage:"));
diff --git a/source3/utils/net.h b/source3/utils/net.h
index ce19c57f475..cded8e155cf 100644
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -133,7 +133,7 @@ typedef struct copy_clistate {
 	struct cli_state *cli_share_src;
 	struct cli_state *cli_share_dst;
 	char *cwd;
-	uint16 attribute;
+	uint16_t attribute;
 	struct net_context *c;
 }copy_clistate;
 
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index b0e7112cfdb..a8f3892bb29 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -230,7 +230,7 @@ static void use_in_memory_ccache(void) {
 }
 
 static ADS_STATUS ads_startup_int(struct net_context *c, bool only_own_domain,
-				  uint32 auth_flags, ADS_STRUCT **ads_ret)
+				  uint32_t auth_flags, ADS_STRUCT **ads_ret)
 {
 	ADS_STRUCT *ads = NULL;
 	ADS_STATUS status;
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 8b789e51914..f2f65c8790e 100644
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -34,8 +34,8 @@ static int net_ads_gpo_refresh(struct net_context *c, int argc, const char **arg
 	const char *dn = NULL;
 	struct GROUP_POLICY_OBJECT *gpo_list = NULL;
 	struct GROUP_POLICY_OBJECT *read_list = NULL;
-	uint32 uac = 0;
-	uint32 flags = 0;
+	uint32_t uac = 0;
+	uint32_t flags = 0;
 	struct GROUP_POLICY_OBJECT *gpo;
 	NTSTATUS result;
 	struct security_token *token = NULL;
@@ -305,8 +305,8 @@ static int net_ads_gpo_list(struct net_context *c, int argc, const char **argv)
 	LDAPMessage *res = NULL;
 	TALLOC_CTX *mem_ctx;
 	const char *dn = NULL;
-	uint32 uac = 0;
-	uint32 flags = 0;
+	uint32_t uac = 0;
+	uint32_t flags = 0;
 	struct GROUP_POLICY_OBJECT *gpo_list;
 	struct security_token *token = NULL;
 
@@ -376,8 +376,8 @@ static int net_ads_gpo_apply(struct net_context *c, int argc, const char **argv)
 	ADS_STATUS status;
 	const char *dn = NULL;
 	struct GROUP_POLICY_OBJECT *gpo_list;
-	uint32 uac = 0;
-	uint32 flags = 0;
+	uint32_t uac = 0;
+	uint32_t flags = 0;
 	struct security_token *token = NULL;
 	const char *filter = NULL;
 
@@ -501,7 +501,7 @@ static int net_ads_gpo_link_add(struct net_context *c, int argc, const char **ar
 {
 	ADS_STRUCT *ads;
 	ADS_STATUS status;
-	uint32 gpo_opt = 0;
+	uint32_t gpo_opt = 0;
 	TALLOC_CTX *mem_ctx;
 
 	if (argc < 2 || c->display_usage) {
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 8c6aa2e5c0a..0f86df07f4b 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -195,7 +195,7 @@ static int net_groupmap_add(struct net_context *c, int argc, const char **argv)
 	fstring type = "";
 	fstring ntcomment = "";
 	enum lsa_SidType sid_type = SID_NAME_DOM_GRP;
-	uint32 rid = 0;
+	uint32_t rid = 0;
 	gid_t gid;
 	int i;
 	GROUP_MAP *map;
@@ -860,7 +860,7 @@ static bool print_alias_memberships(TALLOC_CTX *mem_ctx,
 				    const struct dom_sid *domain_sid,
 				    const struct dom_sid *member)
 {
-	uint32 *alias_rids;
+	uint32_t *alias_rids;
 	size_t i, num_alias_rids;
 
 	alias_rids = NULL;
diff --git a/source3/utils/net_proto.h b/source3/utils/net_proto.h
index 25e9db2fdb0..27cdb8d98ba 100644
--- a/source3/utils/net_proto.h
+++ b/source3/utils/net_proto.h
@@ -332,7 +332,7 @@ int rpc_vampire_keytab(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_rpc_service.c  */
 
-const char *svc_status_string( uint32 state );
+const char *svc_status_string( uint32_t state );
 int net_rpc_service(struct net_context *c, int argc, const char **argv);
 
 /* The following definitions come from utils/net_rpc_sh_acct.c  */
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index d5b78fc99c1..4be7b5f74b8 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -53,15 +53,15 @@ int net_rap_file_usage(struct net_context *c, int argc, const char **argv)
 /***************************************************************************
   list info on an open file
 ***************************************************************************/
-static void file_fn(const char * pPath, const char * pUser, uint16 perms,
-		    uint16 locks, uint32 id)
+static void file_fn(const char * pPath, const char * pUser, uint16_t perms,
+		    uint16_t locks, uint32_t id)
 {
 	d_printf("%-7.1d %-20.20s 0x%-4.2x %-6.1d %s\n",
 		 id, pUser, perms, locks, pPath);
 }
 
-static void one_file_fn(const char *pPath, const char *pUser, uint16 perms,
-			uint16 locks, uint32 id)
+static void one_file_fn(const char *pPath, const char *pUser, uint16_t perms,
+			uint16_t locks, uint32_t id)
 {
 	d_printf(_("File ID          %d\n"
 		   "User name        %s\n"
@@ -196,14 +196,14 @@ int net_rap_share_usage(struct net_context *c, int argc, const char **argv)
 	return net_share_usage(c, argc, argv);
 }
 
-static void long_share_fn(const char *share_name, uint32 type,
+static void long_share_fn(const char *share_name, uint32_t type,
 			  const char *comment, void *state)
 {
 	d_printf("%-12s %-8.8s %-50s\n",
 		 share_name, net_share_type_str(type), comment);
 }
 
-static void share_fn(const char *share_name, uint32 type,
+static void share_fn(const char *share_name, uint32_t type,
 		     const char *comment, void *state)
 {
 	d_printf("%s\n", share_name);
@@ -348,9 +348,9 @@ int net_rap_session_usage(struct net_context *c, int argc, const char **argv)
 	return -1;
 }
 
-static void list_sessions_func(char *wsname, char *username, uint16 conns,
-			uint16 opens, uint16 users, uint32 sess_time,
-			uint32 idle_time, uint32 user_flags, char *clitype)
+static void list_sessions_func(char *wsname, char *username, uint16_t conns,
+			uint16_t opens, uint16_t users, uint32_t sess_time,
+			uint32_t idle_time, uint32 user_flags, char *clitype)
 {
 	int hrs = idle_time / 3600;
 	int min = (idle_time / 60) % 60;
@@ -361,9 +361,9 @@ static void list_sessions_func(char *wsname, char *username, uint16 conns,
 }
 
 static void display_session_func(const char *wsname, const char *username,
-				 uint16 conns, uint16 opens, uint16 users,
-				 uint32 sess_time, uint32 idle_time,
-				 uint32 user_flags, const char *clitype)
+				 uint16_t conns, uint16_t opens, uint16 users,
+				 uint32_t sess_time, uint32 idle_time,
+				 uint32_t user_flags, const char *clitype)
 {
 	int ihrs = idle_time / 3600;
 	int imin = (idle_time / 60) % 60;
@@ -382,8 +382,8 @@ static void display_session_func(const char *wsname, const char *username,
 		 shrs, smin, ssec, ihrs, imin, isec);
 }
 
-static void display_conns_func(uint16 conn_id, uint16 conn_type, uint16 opens,
-			       uint16 users, uint32 conn_time,
+static void display_conns_func(uint16_t conn_id, uint16_t conn_type, uint16 opens,
+			       uint16_t users, uint32_t conn_time,
 			       const char *username, const char *netname)
 {
 	d_printf("%-14.14s %-8.8s %5d\n",
@@ -496,7 +496,7 @@ int net_rap_session(struct net_context *c, int argc, const char **argv)
 /****************************************************************************
 list a server name
 ****************************************************************************/
-static void display_server_func(const char *name, uint32 m,
+static void display_server_func(const char *name, uint32_t m,
 				const char *comment, void * reserved)
 {
 	d_printf("\t%-16.16s     %s\n", name, comment);
@@ -634,10 +634,10 @@ int net_rap_printq_usage(struct net_context *c, int argc, const char **argv)
 	return -1;
 }
 
-static void enum_queue(const char *queuename, uint16 pri, uint16 start,
-		       uint16 until, const char *sep, const char *pproc,
+static void enum_queue(const char *queuename, uint16_t pri, uint16_t start,
+		       uint16_t until, const char *sep, const char *pproc,
 		       const char *dest, const char *qparms,
-		       const char *qcomment, uint16 status, uint16 jobcount)
+		       const char *qcomment, uint16_t status, uint16_t jobcount)
 {
 	d_printf(_("%-17.17s Queue %5d jobs                      "),
 		 queuename, jobcount);
@@ -660,9 +660,9 @@ static void enum_queue(const char *queuename, uint16 pri, uint16 start,
 	}
 }
 
-static void enum_jobs(uint16 jobid, const char *ownername,
+static void enum_jobs(uint16_t jobid, const char *ownername,
 		      const char *notifyname, const char *datatype,
-		      const char *jparms, uint16 pos, uint16 status,
+		      const char *jparms, uint16_t pos, uint16_t status,
 		      const char *jstatus, unsigned int submitted, unsigned int jobsize,
 		      const char *comment)
 {
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index cdfb3181549..0ebb51bac46 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -48,7 +48,7 @@
  * split given path into hive and remaining path and open the hive key
  */
 static WERROR open_hive(TALLOC_CTX *ctx, const char *path,
-			uint32 desired_access,
+			uint32_t desired_access,
 			struct registry_key **hive,
 			char **subkeyname)
 {
@@ -91,7 +91,7 @@ done:
 }
 
 static WERROR open_key(TALLOC_CTX *ctx, const char *path,
-		       uint32 desired_access,
+		       uint32_t desired_access,
 		       struct registry_key **key)
 {
 	WERROR werr;
diff --git a/source3/utils/net_registry_util.c b/source3/utils/net_registry_util.c
index 2020a0a4737..3552a6a58ca 100644
--- a/source3/utils/net_registry_util.c
+++ b/source3/utils/net_registry_util.c
@@ -79,7 +79,7 @@ void print_registry_value(const struct registry_value *valvalue, bool raw)
 		break;
 	}
 	case REG_MULTI_SZ: {
-		uint32 j;
+		uint32_t j;
 		const char **a;
 
 		if (!pull_reg_multi_sz(talloc_tos(), &valvalue->data, &a)) {
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 2df009d1f95..6eb27c94fee 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -1336,7 +1336,7 @@ static NTSTATUS rpc_sh_handle_user(struct net_context *c,
 	struct policy_handle connect_pol, domain_pol, user_pol;
 	NTSTATUS status, result;
 	struct dom_sid sid;
-	uint32 rid;
+	uint32_t rid;
 	enum lsa_SidType type;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -1590,7 +1590,7 @@ static NTSTATUS rpc_sh_user_flag_edit_internals(struct net_context *c,
 	NTSTATUS status, result;
 	const char *username;
 	const char *oldval = "unknown";
-	uint32 oldflags, newflags;
+	uint32_t oldflags, newflags;
 	bool newval;
 	union samr_UserInfo *info = NULL;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -2196,7 +2196,7 @@ static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
 {
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
-	uint32 group_rid;
+	uint32_t group_rid;
 	struct policy_handle group_pol;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -2307,7 +2307,7 @@ static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
 {
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
-	uint32 alias_rid;
+	uint32_t alias_rid;
 	struct policy_handle alias_pol;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -2460,7 +2460,7 @@ static NTSTATUS rpc_del_groupmem(struct net_context *c,
 {
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
-	uint32 group_rid;
+	uint32_t group_rid;
 	struct policy_handle group_pol;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -2568,7 +2568,7 @@ static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
 {
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
-	uint32 alias_rid;
+	uint32_t alias_rid;
 	struct policy_handle alias_pol;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -2741,7 +2741,7 @@ static NTSTATUS rpc_group_list_internals(struct net_context *c,
 {
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
-	uint32 start_idx=0, max_entries=250, num_entries, i, loop_count = 0;
+	uint32_t start_idx=0, max_entries=250, num_entries, i, loop_count = 0;
 	struct samr_SamArray *groups = NULL;
 	bool global = false;
 	bool local = false;
@@ -3019,11 +3019,11 @@ static NTSTATUS rpc_list_group_members(struct net_context *c,
 					const char *domain_name,
 					const struct dom_sid *domain_sid,
 					struct policy_handle *domain_pol,
-					uint32 rid)
+					uint32_t rid)
 {
 	NTSTATUS result, status;
 	struct policy_handle group_pol;
-	uint32 num_members, *group_rids;
+	uint32_t num_members, *group_rids;
 	int i;
 	struct samr_RidAttrArray *rids = NULL;
 	struct lsa_Strings names;
@@ -3113,12 +3113,12 @@ static NTSTATUS rpc_list_alias_members(struct net_context *c,
 				       struct cli_state *cli,
 				       TALLOC_CTX *mem_ctx,
 				       struct policy_handle *domain_pol,
-				       uint32 rid)
+				       uint32_t rid)
 {
 	NTSTATUS result, status;
 	struct rpc_pipe_client *lsa_pipe;
 	struct policy_handle alias_pol, lsa_pol;
-	uint32 num_members;
+	uint32_t num_members;
 	struct dom_sid *alias_sids;
 	char **domains;
 	char **names;
@@ -3515,8 +3515,8 @@ static int rpc_share_add(struct net_context *c, int argc, const char **argv)
 	NET_API_STATUS status;
 	char *sharename;
 	char *path;
-	uint32 type = STYPE_DISKTREE; /* only allow disk shares to be added */
-	uint32 num_users=0, perms=0;
+	uint32_t type = STYPE_DISKTREE; /* only allow disk shares to be added */
+	uint32_t num_users=0, perms=0;
 	char *password=NULL; /* don't allow a share password */
 	struct SHARE_INFO_2 i2;
 	uint32_t parm_error = 0;
@@ -3598,7 +3598,7 @@ static void display_share_info_1(struct net_context *c,
 static WERROR get_share_info(struct net_context *c,
 			     struct rpc_pipe_client *pipe_hnd,
 			     TALLOC_CTX *mem_ctx,
-			     uint32 level,
+			     uint32_t level,
 			     int argc,
 			     const char **argv,
 			     struct srvsvc_NetShareInfoCtr *info_ctr)
@@ -3769,7 +3769,7 @@ static bool check_share_availability(struct cli_state *cli, const char *netname)
 }
 
 static bool check_share_sanity(struct net_context *c, struct cli_state *cli,
-			       const char *netname, uint32 type)
+			       const char *netname, uint32_t type)
 {
 	/* only support disk shares */
 	if (! ( type == STYPE_DISKTREE || type == (STYPE_DISKTREE | STYPE_HIDDEN)) ) {
@@ -3820,10 +3820,10 @@ static NTSTATUS rpc_share_migrate_shares_internals(struct net_context *c,
 	WERROR result;
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	struct srvsvc_NetShareInfoCtr ctr_src;
-	uint32 i;
+	uint32_t i;
 	struct rpc_pipe_client *srvsvc_pipe = NULL;
 	struct cli_state *cli_dst = NULL;
-	uint32 level = 502; /* includes secdesc */
+	uint32_t level = 502; /* includes secdesc */
 	uint32_t parm_error = 0;
 	struct dcerpc_binding_handle *b;
 
@@ -4145,8 +4145,8 @@ static NTSTATUS rpc_share_migrate_files_internals(struct net_context *c,
 	WERROR result;
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	struct srvsvc_NetShareInfoCtr ctr_src;
-	uint32 i;
-	uint32 level = 502;
+	uint32_t i;
+	uint32_t level = 502;
 	struct copy_clistate cp_clistate;
 	bool got_src_share = false;
 	bool got_dst_share = false;
@@ -4305,10 +4305,10 @@ static NTSTATUS rpc_share_migrate_security_internals(struct net_context *c,
 	NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
 	struct srvsvc_NetShareInfoCtr ctr_src;
 	union srvsvc_NetShareInfo info;
-	uint32 i;
+	uint32_t i;
 	struct rpc_pipe_client *srvsvc_pipe = NULL;
 	struct cli_state *cli_dst = NULL;
-	uint32 level = 502; /* includes secdesc */
+	uint32_t level = 502; /* includes secdesc */
 	uint32_t parm_error = 0;
 	struct dcerpc_binding_handle *b;
 
@@ -4512,7 +4512,7 @@ static int rpc_share_migrate(struct net_context *c, int argc, const char **argv)
 
 struct full_alias {
 	struct dom_sid sid;
-	uint32 num_members;
+	uint32_t num_members;
 	struct dom_sid *members;
 };
 
@@ -4541,7 +4541,7 @@ static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
 					struct policy_handle *connect_pol,
 					const struct dom_sid *domain_sid)
 {
-	uint32 start_idx, max_entries, num_entries, i;
+	uint32_t start_idx, max_entries, num_entries, i;
 	struct samr_SamArray *groups = NULL;
 	NTSTATUS result, status;
 	struct policy_handle domain_pol;
@@ -5076,7 +5076,7 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd,
 	union srvsvc_NetShareInfo info;
 	WERROR result;
 	NTSTATUS status;
-	uint16 cnum;
+	uint16_t cnum;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
 	status = dcerpc_srvsvc_NetShareGetInfo(b, mem_ctx,
@@ -5111,7 +5111,7 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd,
 	}
 
 	for (i=0; i<num_tokens; i++) {
-		uint32 acc_granted;
+		uint32_t acc_granted;
 
 		if (share_sd != NULL) {
 			status = se_access_check(share_sd, &tokens[i].token,
@@ -5587,7 +5587,7 @@ static void display_file_info_3(struct FILE_INFO_3 *r)
 static int rpc_file_user(struct net_context *c, int argc, const char **argv)
 {
 	NET_API_STATUS status;
-	uint32 preferred_len = 0xffffffff, i;
+	uint32_t preferred_len = 0xffffffff, i;
 	char *username=NULL;
 	uint32_t total_entries = 0;
 	uint32_t entries_read = 0;
@@ -5851,7 +5851,7 @@ NTSTATUS rpc_init_shutdown_internals(struct net_context *c,
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	WERROR result;
         const char *msg = N_("This machine will be shutdown shortly");
-	uint32 timeout = 20;
+	uint32_t timeout = 20;
 	struct lsa_StringLarge msg_string;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -5907,7 +5907,7 @@ NTSTATUS rpc_reg_shutdown_internals(struct net_context *c,
 				    const char **argv)
 {
         const char *msg = N_("This machine will be shutdown shortly");
-	uint32 timeout = 20;
+	uint32_t timeout = 20;
 	struct lsa_StringLarge msg_string;
 	NTSTATUS result;
 	WERROR werr;
@@ -6012,9 +6012,9 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
 	NTSTATUS status, result;
 	char *acct_name;
 	struct lsa_String lsa_acct_name;
-	uint32 acb_info;
-	uint32 acct_flags=0;
-	uint32 user_rid;
+	uint32_t acb_info;
+	uint32_t acct_flags=0;
+	uint32_t user_rid;
 	uint32_t access_granted = 0;
 	union samr_UserInfo info;
 	unsigned int orig_timeout;
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 242235bd314..9eb7554dd78 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -89,7 +89,7 @@ static void display_reg_value(const char *subkey, const char *name, struct regis
 
 	switch(value->type) {
 	case REG_DWORD:
-		if (value->data.length == sizeof(uint32)) {
+		if (value->data.length == sizeof(uint32_t)) {
 			d_printf(_("\t[%s:%s]: REG_DWORD: 0x%08x\n"), subkey,
 				 name, IVAL(value->data.data,0));
 		} else {
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index cc4eaa7eaa5..2a230774d61 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -75,7 +75,7 @@ static NTSTATUS dcerpc_winreg_Connect(struct dcerpc_binding_handle *b, TALLOC_CT
 }
 
 static bool reg_hive_key(TALLOC_CTX *ctx, const char *fullname,
-			 uint32 *reg_type, const char **key_name)
+			 uint32_t *reg_type, const char **key_name)
 {
 	WERROR werr;
 	char *hivename = NULL;
@@ -128,11 +128,11 @@ done:
 
 static NTSTATUS registry_openkey(TALLOC_CTX *mem_ctx,
 				 struct rpc_pipe_client *pipe_hnd,
-				 const char *name, uint32 access_mask,
+				 const char *name, uint32_t access_mask,
 				 struct policy_handle *hive_hnd,
 				 struct policy_handle *key_hnd)
 {
-	uint32 hive;
+	uint32_t hive;
 	NTSTATUS status;
 	WERROR werr;
 	struct winreg_String key;
@@ -171,17 +171,17 @@ static NTSTATUS registry_openkey(TALLOC_CTX *mem_ctx,
 static NTSTATUS registry_enumkeys(TALLOC_CTX *ctx,
 				  struct rpc_pipe_client *pipe_hnd,
 				  struct policy_handle *key_hnd,
-				  uint32 *pnum_keys, char ***pnames,
+				  uint32_t *pnum_keys, char ***pnames,
 				  char ***pclasses, NTTIME ***pmodtimes)
 {
 	TALLOC_CTX *mem_ctx;
 	NTSTATUS status;
 	WERROR werr;
-	uint32 num_subkeys, max_subkeylen, max_classlen;
-	uint32 num_values, max_valnamelen, max_valbufsize;
-	uint32 i;
+	uint32_t num_subkeys, max_subkeylen, max_classlen;
+	uint32_t num_values, max_valnamelen, max_valbufsize;
+	uint32_t i;
 	NTTIME last_changed_time;
-	uint32 secdescsize;
+	uint32_t secdescsize;
 	struct winreg_String classname;
 	char **names, **classes;
 	NTTIME **modtimes;
@@ -293,17 +293,17 @@ static NTSTATUS registry_enumkeys(TALLOC_CTX *ctx,
 static NTSTATUS registry_enumvalues(TALLOC_CTX *ctx,
 				    struct rpc_pipe_client *pipe_hnd,
 				    struct policy_handle *key_hnd,
-				    uint32 *pnum_values, char ***pvalnames,
+				    uint32_t *pnum_values, char ***pvalnames,
 				    struct registry_value ***pvalues)
 {
 	TALLOC_CTX *mem_ctx;
 	NTSTATUS status;
 	WERROR werr;
-	uint32 num_subkeys, max_subkeylen, max_classlen;
-	uint32 num_values, max_valnamelen, max_valbufsize;
-	uint32 i;
+	uint32_t num_subkeys, max_subkeylen, max_classlen;
+	uint32_t num_values, max_valnamelen, max_valbufsize;
+	uint32_t i;
 	NTTIME last_changed_time;
-	uint32 secdescsize;
+	uint32_t secdescsize;
 	struct winreg_String classname;
 	struct registry_value **values;
 	char **names;
@@ -342,9 +342,9 @@ static NTSTATUS registry_enumvalues(TALLOC_CTX *ctx,
 
 	for (i=0; i<num_values; i++) {
 		enum winreg_Type type = REG_NONE;
-		uint8 *data = NULL;
-		uint32 data_size;
-		uint32 value_length;
+		uint8_t *data = NULL;
+		uint32_t data_size;
+		uint32_t value_length;
 
 		char n;
 		struct winreg_ValNameBuf name_buf;
@@ -355,7 +355,7 @@ static NTSTATUS registry_enumvalues(TALLOC_CTX *ctx,
 		name_buf.size = max_valnamelen + 2;
 
 		data_size = max_valbufsize;
-		data = (uint8 *)TALLOC(mem_ctx, data_size);
+		data = (uint8_t *)TALLOC(mem_ctx, data_size);
 		value_length = 0;
 
 		status = dcerpc_winreg_EnumValue(b, mem_ctx, key_hnd,
@@ -416,17 +416,17 @@ static NTSTATUS registry_enumvalues(TALLOC_CTX *ctx,
 static NTSTATUS registry_enumvalues2(TALLOC_CTX *ctx,
 				     struct rpc_pipe_client *pipe_hnd,
 				     struct policy_handle *key_hnd,
-				     uint32 *pnum_values, char ***pvalnames,
+				     uint32_t *pnum_values, char ***pvalnames,
 				     struct regval_blob ***pvalues)
 {
 	TALLOC_CTX *mem_ctx;
 	NTSTATUS status;
 	WERROR werr;
-	uint32 num_subkeys, max_subkeylen, max_classlen;
-	uint32 num_values, max_valnamelen, max_valbufsize;
-	uint32 i;
+	uint32_t num_subkeys, max_subkeylen, max_classlen;
+	uint32_t num_values, max_valnamelen, max_valbufsize;
+	uint32_t i;
 	NTTIME last_changed_time;
-	uint32 secdescsize;
+	uint32_t secdescsize;
 	struct winreg_String classname;
 	struct regval_blob **values;
 	char **names;
@@ -465,9 +465,9 @@ static NTSTATUS registry_enumvalues2(TALLOC_CTX *ctx,
 
 	for (i=0; i<num_values; i++) {
 		enum winreg_Type type = REG_NONE;
-		uint8 *data = NULL;
-		uint32 data_size;
-		uint32 value_length;
+		uint8_t *data = NULL;
+		uint32_t data_size;
+		uint32_t value_length;
 
 		char n;
 		struct winreg_ValNameBuf name_buf;
@@ -478,7 +478,7 @@ static NTSTATUS registry_enumvalues2(TALLOC_CTX *ctx,
 		name_buf.size = max_valnamelen + 2;
 
 		data_size = max_valbufsize;
-		data = (uint8 *)TALLOC(mem_ctx, data_size);
+		data = (uint8_t *)TALLOC(mem_ctx, data_size);
 		value_length = 0;
 
 		status = dcerpc_winreg_EnumValue(b, mem_ctx, key_hnd,
@@ -876,7 +876,7 @@ static NTSTATUS rpc_registry_createkey_internal(struct net_context *c,
 						int argc,
 						const char **argv )
 {
-	uint32 hive;
+	uint32_t hive;
 	struct policy_handle hive_hnd, key_hnd;
 	struct winreg_String key, keyclass;
 	enum winreg_CreateAction action;
@@ -962,7 +962,7 @@ static NTSTATUS rpc_registry_deletekey_internal(struct net_context *c,
 						int argc,
 						const char **argv )
 {
-	uint32 hive;
+	uint32_t hive;
 	struct policy_handle hive_hnd;
 	struct winreg_String key;
 	NTSTATUS status;
@@ -1034,11 +1034,11 @@ static NTSTATUS rpc_registry_enumerate_internal(struct net_context *c,
 	struct policy_handle pol_hive, pol_key;
 	NTSTATUS status;
 	WERROR werr;
-	uint32 num_subkeys = 0;
-	uint32 num_values = 0;
+	uint32_t num_subkeys = 0;
+	uint32_t num_values = 0;
 	char **names = NULL, **classes = NULL;
 	NTTIME **modtimes = NULL;
-	uint32 i;
+	uint32_t i;
 	struct registry_value **values = NULL;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -1169,7 +1169,7 @@ static void dump_values( REGF_NK_REC *nk )
 {
 	int i, j;
 	const char *data_str = NULL;
-	uint32 data_size, data;
+	uint32_t data_size, data;
 	DATA_BLOB blob;
 
 	if ( !nk->values )
@@ -1528,12 +1528,12 @@ static NTSTATUS registry_export(struct rpc_pipe_client* pipe_hnd,
 				const char* name)
 {
 	NTSTATUS status;
-	uint32 num_subkeys = 0;
-	uint32 num_values = 0;
+	uint32_t num_subkeys = 0;
+	uint32_t num_values = 0;
 	char **names = NULL, **classes = NULL;
 	NTTIME **modtimes = NULL;
 	struct regval_blob **values = NULL;
-	uint32 i;
+	uint32_t i;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
 	TALLOC_CTX* mem_ctx = talloc_new(ctx);
@@ -1697,7 +1697,7 @@ static WERROR import_create_key(struct import_ctx* ctx,
 	keyname.name = name;
 
 	if (parent == NULL) {
-		uint32 hive_idx = 0;
+		uint32_t hive_idx = 0;
 		if (!reg_hive_key(mem_ctx, name, &hive_idx, &keyname.name)) {
 			werr = WERR_FOOBAR;
 			goto done;
@@ -1795,7 +1795,7 @@ static WERROR import_delete_key(struct import_ctx* ctx,
 	keyname.name = name;
 
 	if (parent == NULL) {
-		uint32 hive_idx;
+		uint32_t hive_idx;
 		if (!reg_hive_key(mem_ctx, name, &hive_idx, &keyname.name)) {
 			werr = WERR_FOOBAR;
 			goto done;
diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index c64f9abe771..9640db0fe60 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -100,12 +100,12 @@ static NTSTATUS enum_privileges(struct rpc_pipe_client *pipe_hnd,
 				struct policy_handle *pol )
 {
 	NTSTATUS status, result;
-	uint32 enum_context = 0;
-	uint32 pref_max_length=0x1000;
+	uint32_t enum_context = 0;
+	uint32_t pref_max_length=0x1000;
 	int i;
-	uint16 lang_id=0;
-	uint16 lang_id_sys=0;
-	uint16 lang_id_desc;
+	uint16_t lang_id=0;
+	uint16_t lang_id_sys=0;
+	uint16_t lang_id_desc;
 	struct lsa_StringLarge *description = NULL;
 	struct lsa_PrivArray priv_array;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -241,8 +241,8 @@ static NTSTATUS enum_accounts_for_privilege(struct rpc_pipe_client *pipe_hnd,
 						const char *privilege)
 {
 	NTSTATUS status, result;
-	uint32 enum_context=0;
-	uint32 pref_max_length=0x1000;
+	uint32_t enum_context=0;
+	uint32_t pref_max_length=0x1000;
 	struct lsa_SidArray sid_array;
 	int i;
 	fstring name;
@@ -294,8 +294,8 @@ static NTSTATUS enum_privileges_for_accounts(struct rpc_pipe_client *pipe_hnd,
 						struct policy_handle *pol)
 {
 	NTSTATUS status, result;
-	uint32 enum_context=0;
-	uint32 pref_max_length=0x1000;
+	uint32_t enum_context=0;
+	uint32_t pref_max_length=0x1000;
 	struct lsa_SidArray sid_array;
 	int i;
 	fstring name;
@@ -352,9 +352,9 @@ static NTSTATUS rpc_rights_list_internal(struct net_context *c,
 	fstring privname;
 	struct lsa_String lsa_name;
 	struct lsa_StringLarge *description = NULL;
-	uint16 lang_id = 0;
-	uint16 lang_id_sys = 0;
-	uint16 lang_id_desc;
+	uint16_t lang_id = 0;
+	uint16_t lang_id_sys = 0;
+	uint16_t lang_id_desc;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
 	status = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, true,
diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index 0c0995a1dcb..3e6a918e83d 100644
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -23,7 +23,7 @@
 #include "../librpc/gen_ndr/ndr_svcctl_c.h"
 
 struct svc_state_msg {
-	uint32 flag;
+	uint32_t flag;
 	const char *message;
 };
 
@@ -41,7 +41,7 @@ static struct svc_state_msg state_msg_table[] = {
 
 /********************************************************************
 ********************************************************************/
-const char *svc_status_string( uint32 state )
+const char *svc_status_string( uint32_t state )
 {
 	fstring msg;
 	int i;
@@ -134,7 +134,7 @@ static WERROR query_service_state(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
 				struct policy_handle *hSCM,
 				const char *service,
-				uint32 *state )
+				uint32_t *state )
 {
 	struct policy_handle hService;
 	struct SERVICE_STATUS service_status;
@@ -181,11 +181,11 @@ static WERROR watch_service_state(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
 				struct policy_handle *hSCM,
 				const char *service,
-				uint32 watch_state,
-				uint32 *final_state )
+				uint32_t watch_state,
+				uint32_t *final_state )
 {
-	uint32 i;
-	uint32 state = 0;
+	uint32_t i;
+	uint32_t state = 0;
 	WERROR result = WERR_GENERAL_FAILURE;
 
 
@@ -216,14 +216,14 @@ static WERROR control_service(struct rpc_pipe_client *pipe_hnd,
 				TALLOC_CTX *mem_ctx,
 				struct policy_handle *hSCM,
 				const char *service,
-				uint32 control,
-				uint32 watch_state )
+				uint32_t control,
+				uint32_t watch_state )
 {
 	struct policy_handle hService;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
 	struct SERVICE_STATUS service_status;
-	uint32 state = 0;
+	uint32_t state = 0;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
 	/* Open the Service */
@@ -684,7 +684,7 @@ static NTSTATUS rpc_service_start_internal(struct net_context *c,
 	struct policy_handle hSCM, hService;
 	WERROR result = WERR_GENERAL_FAILURE;
 	NTSTATUS status;
-	uint32 state = 0;
+	uint32_t state = 0;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
 	if (argc != 1 ) {
diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index f1cb0a4167b..9fe7b6330da 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -142,7 +142,7 @@ static int net_sam_set_workstations(struct net_context *c, int argc,
 
 static int net_sam_set_userflag(struct net_context *c, int argc,
 				const char **argv, const char *field,
-				uint16 flag)
+				uint16_t flag)
 {
 	struct samu *sam_acct = NULL;
 	struct dom_sid sid;
@@ -480,8 +480,8 @@ static int net_sam_set(struct net_context *c, int argc, const char **argv)
 static int net_sam_policy_set(struct net_context *c, int argc, const char **argv)
 {
 	const char *account_policy = NULL;
-	uint32 value = 0;
-	uint32 old_value = 0;
+	uint32_t value = 0;
+	uint32_t old_value = 0;
 	enum pdb_policy_type field;
 	char *endptr;
 
@@ -550,7 +550,7 @@ static int net_sam_policy_set(struct net_context *c, int argc, const char **argv
 static int net_sam_policy_show(struct net_context *c, int argc, const char **argv)
 {
 	const char *account_policy = NULL;
-        uint32 old_value;
+        uint32_t old_value;
         enum pdb_policy_type field;
 
         if (argc != 1 || c->display_usage) {
@@ -825,7 +825,7 @@ static int net_sam_rights(struct net_context *c, int argc, const char **argv)
 static NTSTATUS map_unix_group(const struct group *grp, GROUP_MAP *map)
 {
 	const char *dom, *name;
-	uint32 rid;
+	uint32_t rid;
 
 	if (pdb_getgrgid(map, grp->gr_gid)) {
 		return NT_STATUS_GROUP_EXISTS;
@@ -970,7 +970,7 @@ static int net_sam_createdomaingroup(struct net_context *c, int argc,
 				     const char **argv)
 {
 	NTSTATUS status;
-	uint32 rid;
+	uint32_t rid;
 
 	if (argc != 1 || c->display_usage) {
 		d_fprintf(stderr, "%s\n%s",
@@ -1046,7 +1046,7 @@ static int net_sam_deletedomaingroup(struct net_context *c, int argc,
 static int net_sam_createlocalgroup(struct net_context *c, int argc, const char **argv)
 {
 	NTSTATUS status;
-	uint32 rid;
+	uint32_t rid;
 
 	if (argc != 1 || c->display_usage) {
 		d_fprintf(stderr, "%s\n%s",
@@ -1124,7 +1124,7 @@ static int net_sam_deletelocalgroup(struct net_context *c, int argc, const char
 static int net_sam_createbuiltingroup(struct net_context *c, int argc, const char **argv)
 {
 	NTSTATUS status;
-	uint32 rid;
+	uint32_t rid;
 	enum lsa_SidType type;
 	fstring groupname;
 	struct dom_sid sid;
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 4124ae57a18..ca13481ef84 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -498,10 +498,10 @@ NTSTATUS contact_winbind_auth_crap(const char *username,
 				   const DATA_BLOB *challenge,
 				   const DATA_BLOB *lm_response,
 				   const DATA_BLOB *nt_response,
-				   uint32 flags,
-				   uint32 extra_logon_parameters,
-				   uint8 lm_key[8],
-				   uint8 user_session_key[16],
+				   uint32_t flags,
+				   uint32_t extra_logon_parameters,
+				   uint8_t lm_key[8],
+				   uint8_t user_session_key[16],
 				   char **error_string,
 				   char **unix_name)
 {
@@ -879,8 +879,8 @@ static NTSTATUS winbind_pw_check(struct auth4_context *auth4_context,
 	static const char zeros[16] = { 0, };
 	NTSTATUS nt_status;
 	char *error_string = NULL;
-	uint8 lm_key[8]; 
-	uint8 user_sess_key[16]; 
+	uint8_t lm_key[8]; 
+	uint8_t user_sess_key[16]; 
 	char *unix_name = NULL;
 
 	nt_status = contact_winbind_auth_crap(user_info->client.account_name, user_info->client.domain_name, 
@@ -2175,7 +2175,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
 			char *error_string = NULL;
 			uchar lm_key[8];
 			uchar user_session_key[16];
-			uint32 flags = 0;
+			uint32_t flags = 0;
 
 			if (full_username && !username) {
 				fstring fstr_user;
@@ -2645,13 +2645,13 @@ static void squid_stream(enum stdio_helper_mode stdio_mode,
 static bool check_auth_crap(void)
 {
 	NTSTATUS nt_status;
-	uint32 flags = 0;
+	uint32_t flags = 0;
 	char lm_key[8];
 	char user_session_key[16];
 	char *hex_lm_key;
 	char *hex_user_session_key;
 	char *error_string;
-	static uint8 zeros[16];
+	static uint8_t zeros[16];
 
 	x_setbuf(x_stdout, NULL);
 
diff --git a/source3/utils/ntlm_auth_diagnostics.c b/source3/utils/ntlm_auth_diagnostics.c
index e83e975ffda..5533fd201fc 100644
--- a/source3/utils/ntlm_auth_diagnostics.c
+++ b/source3/utils/ntlm_auth_diagnostics.c
@@ -50,7 +50,7 @@ static bool test_lm_ntlm_broken(enum ntlm_break break_which)
 {
 	bool pass = True;
 	NTSTATUS nt_status;
-	uint32 flags = 0;
+	uint32_t flags = 0;
 	DATA_BLOB lm_response = data_blob(NULL, 24);
 	DATA_BLOB nt_response = data_blob(NULL, 24);
 	DATA_BLOB session_key = data_blob(NULL, 16);
@@ -174,7 +174,7 @@ static bool test_ntlm_in_lm(void)
 {
 	bool pass = True;
 	NTSTATUS nt_status;
-	uint32 flags = 0;
+	uint32_t flags = 0;
 	DATA_BLOB nt_response = data_blob(NULL, 24);
 
 	uchar lm_key[8];
@@ -240,14 +240,14 @@ static bool test_ntlm_in_both(void)
 {
 	bool pass = True;
 	NTSTATUS nt_status;
-	uint32 flags = 0;
+	uint32_t flags = 0;
 	DATA_BLOB nt_response = data_blob(NULL, 24);
 	DATA_BLOB session_key = data_blob(NULL, 16);
 
-	uint8 lm_key[8];
-	uint8 lm_hash[16];
-	uint8 user_session_key[16];
-	uint8 nt_hash[16];
+	uint8_t lm_key[8];
+	uint8_t lm_hash[16];
+	uint8_t user_session_key[16];
+	uint8_t nt_hash[16];
 	DATA_BLOB chall = get_challenge();
 	char *error_string;
 	
@@ -314,7 +314,7 @@ static bool test_lmv2_ntlmv2_broken(enum ntlm_break break_which)
 {
 	bool pass = True;
 	NTSTATUS nt_status;
-	uint32 flags = 0;
+	uint32_t flags = 0;
 	DATA_BLOB ntlmv2_response = data_blob_null;
 	DATA_BLOB lmv2_response = data_blob_null;
 	DATA_BLOB ntlmv2_session_key = data_blob_null;
@@ -442,7 +442,7 @@ static bool test_ntlmv2_ntlmv2_broken(void)
 static bool test_plaintext(enum ntlm_break break_which)
 {
 	NTSTATUS nt_status;
-	uint32 flags = 0;
+	uint32_t flags = 0;
 	DATA_BLOB nt_response = data_blob_null;
 	DATA_BLOB lm_response = data_blob_null;
 	char *password;
diff --git a/source3/utils/ntlm_auth_proto.h b/source3/utils/ntlm_auth_proto.h
index ae26c948b83..367fd79d3d9 100644
--- a/source3/utils/ntlm_auth_proto.h
+++ b/source3/utils/ntlm_auth_proto.h
@@ -35,10 +35,10 @@ NTSTATUS contact_winbind_auth_crap(const char *username,
 				   const DATA_BLOB *challenge,
 				   const DATA_BLOB *lm_response,
 				   const DATA_BLOB *nt_response,
-				   uint32 flags,
-				   uint32 extra_logon_parameters,
-				   uint8 lm_key[8],
-				   uint8 user_session_key[16],
+				   uint32_t flags,
+				   uint32_t extra_logon_parameters,
+				   uint8_t lm_key[8],
+				   uint8_t user_session_key[16],
 				   char **error_string,
 				   char **unix_name);
 
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 1d53c6e37c3..1f44fb0ee4f 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -332,7 +332,7 @@ static int print_sam_info (struct samu *sam_pwent, bool verbosity, bool smbpwdst
 		       lm_passwd,
 		       nt_passwd,
 		       pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
-		       (uint32)convert_time_t_to_uint32_t(pdb_get_pass_last_set_time(sam_pwent)));
+		       (uint32_t)convert_time_t_to_uint32_t(pdb_get_pass_last_set_time(sam_pwent)));
 	} else {
 		uid = nametouid(pdb_get_username(sam_pwent));
 		printf ("%s:%lu:%s\n", pdb_get_username(sam_pwent), (unsigned long)uid,
@@ -992,7 +992,7 @@ int main(int argc, const char **argv)
 	static int add_user = False;
 	static int delete_user = False;
 	static int modify_user = False;
-	uint32	setparms, checkparms;
+	uint32_t   setparms, checkparms;
 	int opt;
 	static char *full_name = NULL;
 	static char *acct_desc = NULL;
diff --git a/source3/utils/regedit.h b/source3/utils/regedit.h
index 0928f9ea9b4..55a25c91dfd 100644
--- a/source3/utils/regedit.h
+++ b/source3/utils/regedit.h
@@ -33,12 +33,12 @@ WERROR reg_openhive_wrap(TALLOC_CTX *ctx, const char *hive,
 WERROR reg_openkey_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *parent,
 		        const char *name, struct samba3_registry_key *key);
 WERROR reg_enumvalue_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *key,
-			  uint32 idx, char **name, uint32_t *type,
+			  uint32_t idx, char **name, uint32_t *type,
 			  DATA_BLOB *data);
 WERROR reg_queryvalue_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *key,
 			   const char *name, uint32_t *type, DATA_BLOB *data);
 WERROR reg_enumkey_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *key,
-			uint32 idx, char **name, NTTIME *last_write_time);
+			uint32_t idx, char **name, NTTIME *last_write_time);
 WERROR reg_createkey_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *parent,
 			  const char *subkeypath,
 			  struct samba3_registry_key *pkey);
diff --git a/source3/utils/regedit_wrap.c b/source3/utils/regedit_wrap.c
index 00d72d88f1a..93297ebff8d 100644
--- a/source3/utils/regedit_wrap.c
+++ b/source3/utils/regedit_wrap.c
@@ -54,7 +54,7 @@ WERROR reg_openkey_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *parent,
 }
 
 WERROR reg_enumvalue_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *key,
-			  uint32 idx, char **name, uint32_t *type,
+			  uint32_t idx, char **name, uint32_t *type,
 			  DATA_BLOB *data)
 {
 	struct registry_value *val = NULL;
@@ -87,7 +87,7 @@ WERROR reg_queryvalue_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *key,
 }
 
 WERROR reg_enumkey_wrap(TALLOC_CTX *ctx, struct samba3_registry_key *key,
-			uint32 idx, char **name, NTTIME *last_write_time)
+			uint32_t idx, char **name, NTTIME *last_write_time)
 {
 	return reg_enumkey(ctx, key->key, idx, name, last_write_time);
 }
diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index ed4c3ee94ab..941b3a4d2b1 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -136,7 +136,7 @@ static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
 
 static void sort_acl(struct security_acl *the_acl)
 {
-	uint32 i;
+	uint32_t i;
 	if (!the_acl) return;
 
 	TYPESAFE_QSORT(the_acl->aces, the_acl->num_aces, ace_compare);
@@ -161,7 +161,7 @@ static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *th
 	struct security_descriptor *sd = NULL;
 	struct security_descriptor *old = NULL;
 	size_t sd_size = 0;
-	uint32 i, j;
+	uint32_t i, j;
 
 	if (mode != SMB_ACL_SET && mode != SMB_SD_DELETE) {
 	    if (!(old = get_share_security( mem_ctx, sharename, &sd_size )) ) {
@@ -191,7 +191,7 @@ static int change_share_sec(TALLOC_CTX *mem_ctx, const char *sharename, char *th
 		for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
 		    if (security_ace_equal(&sd->dacl->aces[i],
 					   &old->dacl->aces[j])) {
-			uint32 k;
+			uint32_t k;
 			for (k=j; k<old->dacl->num_aces-1;k++) {
 			    old->dacl->aces[k] = old->dacl->aces[k+1];
 			}
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 926e496ef6c..2596069e8ee 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -51,7 +51,7 @@ static NTSTATUS cli_lsa_lookup_domain_sid(struct cli_state *cli,
 					  struct dom_sid *sid)
 {
 	union lsa_PolicyInformation *info = NULL;
-	uint16 orig_cnum = cli_state_get_tid(cli);
+	uint16_t orig_cnum = cli_state_get_tid(cli);
 	struct rpc_pipe_client *rpc_pipe = NULL;
 	struct policy_handle handle;
 	NTSTATUS status, result;
@@ -218,10 +218,10 @@ static struct security_descriptor *sec_desc_parse(TALLOC_CTX *ctx, struct cli_st
 /*****************************************************
 get fileinfo for filename
 *******************************************************/
-static uint16 get_fileinfo(struct cli_state *cli, const char *filename)
+static uint16_t get_fileinfo(struct cli_state *cli, const char *filename)
 {
 	uint16_t fnum = (uint16_t)-1;
-	uint16 mode = 0;
+	uint16_t mode = 0;
 	NTSTATUS status;
 
 	/* The desired access below is the only one I could find that works
@@ -465,7 +465,7 @@ static int ace_compare(struct security_ace *ace1, struct security_ace *ace2)
 
 static void sort_acl(struct security_acl *the_acl)
 {
-	uint32 i;
+	uint32_t i;
 	if (!the_acl) return;
 
 	TYPESAFE_QSORT(the_acl->aces, the_acl->num_aces, ace_compare);
@@ -492,7 +492,7 @@ static int cacl_set(struct cli_state *cli, const char *filename,
 		    char *the_acl, enum acl_mode mode, bool numeric)
 {
 	struct security_descriptor *sd, *old;
-	uint32 i, j;
+	uint32_t i, j;
 	size_t sd_size;
 	int result = EXIT_OK;
 
@@ -520,7 +520,7 @@ static int cacl_set(struct cli_state *cli, const char *filename,
 			for (j=0;old->dacl && j<old->dacl->num_aces;j++) {
 				if (security_ace_equal(&sd->dacl->aces[i],
 						       &old->dacl->aces[j])) {
-					uint32 k;
+					uint32_t k;
 					for (k=j; k<old->dacl->num_aces-1;k++) {
 						old->dacl->aces[k] = old->dacl->aces[k+1];
 					}
@@ -612,7 +612,7 @@ static int inherit(struct cli_state *cli, const char *filename,
                    const char *type)
 {
 	struct security_descriptor *old,*sd;
-	uint32 oldattr;
+	uint32_t oldattr;
 	size_t sd_size;
 	int result = EXIT_OK;
 
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index e43ddaeeaef..58410e86c40 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -38,7 +38,7 @@ static enum tree_level level = LEV_SHARE;
 struct smb_name_list {
         struct smb_name_list *prev, *next;
         char *name, *comment;
-        uint32 server_type;
+        uint32_t server_type;
 };
 
 static struct smb_name_list *workgroups, *servers, *shares;
@@ -49,7 +49,7 @@ static void free_name_list(struct smb_name_list *list)
                 DLIST_REMOVE(list, list);
 }
 
-static void add_name(const char *machine_name, uint32 server_type,
+static void add_name(const char *machine_name, uint32_t server_type,
                      const char *comment, void *state)
 {
         struct smb_name_list **name_list = (struct smb_name_list **)state;
@@ -157,7 +157,7 @@ static bool get_servers(char *workgroup, struct user_auth_info *user_info)
 }
 
 static bool get_rpc_shares(struct cli_state *cli,
-			   void (*fn)(const char *, uint32, const char *, void *),
+			   void (*fn)(const char *, uint32_t, const char *, void *),
 			   void *state)
 {
 	NTSTATUS status;