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

1 files changed, 31 insertions, 31 deletions

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;