Convert all uint32/16/8 to _t in source3/rpcclient.

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

8 files changed, 82 insertions, 82 deletions

diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index 59fafe928b1..43d17b34608 100644
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -58,7 +58,7 @@ static WERROR cmd_dfs_add(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	NTSTATUS result;
 	WERROR werr;
 	const char *path, *servername, *sharename, *comment;
-	uint32 flags = 0;
+	uint32_t flags = 0;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if (argc != 5) {
@@ -149,7 +149,7 @@ static void display_dfs_info_3(struct dfs_Info3 *info3)
 
 
 /* Display a DFS_INFO_CTR structure */
-static void display_dfs_info(uint32 level, union dfs_Info *ctr)
+static void display_dfs_info(uint32_t level, union dfs_Info *ctr)
 {
 	switch (level) {
 		case 0x01:
@@ -202,7 +202,7 @@ static WERROR cmd_dfs_enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 
 	NTSTATUS result;
 	WERROR werr;
-	uint32 total = 0;
+	uint32_t total = 0;
 
 	if (argc > 2) {
 		printf("Usage: %s [info_level]\n", argv[0]);
@@ -253,7 +253,7 @@ static WERROR cmd_dfs_enumex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 
 	NTSTATUS result;
 	WERROR werr;
-	uint32 total = 0;
+	uint32_t total = 0;
 
 	if (argc < 2 || argc > 3) {
 		printf("Usage: %s dfs_name [info_level]\n", argv[0]);
@@ -296,7 +296,7 @@ static WERROR cmd_dfs_getinfo(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 	NTSTATUS result;
 	WERROR werr;
 	const char *path, *servername, *sharename;
-	uint32 info_level = 1;
+	uint32_t info_level = 1;
 	union dfs_Info ctr;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
diff --git a/source3/rpcclient/cmd_echo.c b/source3/rpcclient/cmd_echo.c
index c1c97e339d7..b6072be0799 100644
--- a/source3/rpcclient/cmd_echo.c
+++ b/source3/rpcclient/cmd_echo.c
@@ -26,7 +26,7 @@ static NTSTATUS cmd_echo_add_one(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ct
 				 int argc, const char **argv)
 {
 	struct dcerpc_binding_handle *b = cli->binding_handle;
-	uint32 request = 1, response;
+	uint32_t request = 1, response;
 	NTSTATUS status;
 
 	if (argc > 2) {
@@ -53,7 +53,7 @@ static NTSTATUS cmd_echo_data(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 			      int argc, const char **argv)
 {
 	struct dcerpc_binding_handle *b = cli->binding_handle;
-	uint32 size, i;
+	uint32_t size, i;
 	NTSTATUS status;
 	uint8_t *in_data = NULL, *out_data = NULL;
 
@@ -105,7 +105,7 @@ static NTSTATUS cmd_echo_source_data(struct rpc_pipe_client *cli,
 				     const char **argv)
 {
 	struct dcerpc_binding_handle *b = cli->binding_handle;
-	uint32 size, i;
+	uint32_t size, i;
 	NTSTATUS status;
 	uint8_t *out_data = NULL;
 
@@ -146,7 +146,7 @@ static NTSTATUS cmd_echo_sink_data(struct rpc_pipe_client *cli, TALLOC_CTX *mem_
 				   int argc, const char **argv)
 {
 	struct dcerpc_binding_handle *b = cli->binding_handle;
-	uint32 size, i;
+	uint32_t size, i;
 	NTSTATUS status;
 	uint8_t *in_data = NULL;
 
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index a6c3280c2fe..2fa04a27752 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -161,7 +161,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
 	union lsa_PolicyInformation *info = NULL;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
-	uint32 info_class = 3;
+	uint32_t info_class = 3;
 
 	if (argc > 2) {
 		printf("Usage: %s [info_class]\n", argv[0]);
@@ -546,7 +546,7 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli,
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	/* defaults, but may be changed using params */
-	uint32 enum_ctx = 0;
+	uint32_t enum_ctx = 0;
 	int i;
 	uint32_t max_size = (uint32_t)-1;
 
@@ -617,8 +617,8 @@ static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli,
 	struct lsa_PrivArray priv_array;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
-	uint32 enum_context=0;
-	uint32 pref_max_length=0x1000;
+	uint32_t enum_context=0;
+	uint32_t pref_max_length=0x1000;
 	int i;
 
 	if (argc > 3) {
@@ -679,9 +679,9 @@ static NTSTATUS cmd_lsa_get_dispname(struct rpc_pipe_client *cli,
 	NTSTATUS status, result;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
-	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_String lsa_name;
 	struct lsa_StringLarge *description = NULL;
 
@@ -732,8 +732,8 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli,
 	NTSTATUS status, result;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
-	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;
 
@@ -792,7 +792,7 @@ static NTSTATUS cmd_lsa_create_account(struct rpc_pipe_client *cli,
 	struct policy_handle dom_pol;
 	struct policy_handle user_pol;
 	NTSTATUS status, result;
-	uint32 des_access = 0x000f000f;
+	uint32_t des_access = 0x000f000f;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	struct dom_sid sid;
@@ -844,7 +844,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli,
 	struct policy_handle dom_pol;
 	struct policy_handle user_pol;
 	NTSTATUS status, result;
-	uint32 access_desired = 0x000f000f;
+	uint32_t access_desired = 0x000f000f;
 	struct dom_sid sid;
 	struct lsa_PrivilegeSet *privs = NULL;
 	int i;
@@ -1136,7 +1136,7 @@ static NTSTATUS cmd_lsa_query_secobj(struct rpc_pipe_client *cli,
 	struct policy_handle pol;
 	NTSTATUS status, result;
 	struct sec_desc_buf *sdb;
-	uint32 sec_info = SECINFO_DACL;
+	uint32_t sec_info = SECINFO_DACL;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if (argc < 1 || argc > 2) {
@@ -1222,7 +1222,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
 	struct policy_handle pol;
 	NTSTATUS status, result;
 	struct dom_sid dom_sid;
-	uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	union lsa_TrustedDomainInfo *info = NULL;
 	enum lsa_TrustDomInfoEnum info_class = 1;
 	DATA_BLOB session_key;
@@ -1277,7 +1277,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
 {
 	struct policy_handle pol;
 	NTSTATUS status, result;
-	uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	union lsa_TrustedDomainInfo *info = NULL;
 	enum lsa_TrustDomInfoEnum info_class = 1;
 	struct lsa_String trusted_domain;
@@ -1332,7 +1332,7 @@ static NTSTATUS cmd_lsa_set_trustdominfo(struct rpc_pipe_client *cli,
 {
 	struct policy_handle pol, trustdom_pol;
 	NTSTATUS status, result;
-	uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	union lsa_TrustedDomainInfo info;
 	struct dom_sid dom_sid;
 	enum lsa_TrustDomInfoEnum info_class = 1;
@@ -1402,7 +1402,7 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
 {
 	struct policy_handle pol, trustdom_pol;
 	NTSTATUS status, result;
-	uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	union lsa_TrustedDomainInfo *info = NULL;
 	struct dom_sid dom_sid;
 	enum lsa_TrustDomInfoEnum info_class = 1;
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 1af68f98681..0a8ab205f8a 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -213,7 +213,7 @@ static WERROR cmd_netlogon_dsr_getdcname(struct rpc_pipe_client *cli,
 {
 	NTSTATUS result;
 	WERROR werr = WERR_OK;
-	uint32 flags = DS_RETURN_DNS_NAME;
+	uint32_t flags = DS_RETURN_DNS_NAME;
 	const char *server_name = cli->desthost;
 	const char *domain_name;
 	struct GUID domain_guid = GUID_zero();
@@ -776,7 +776,7 @@ static NTSTATUS cmd_netlogon_sam_logon(struct rpc_pipe_client *cli,
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	int logon_type = NetlogonNetworkInformation;
 	const char *username, *password;
-	uint32 logon_param = 0;
+	uint32_t logon_param = 0;
 	const char *workstation = NULL;
 	struct netr_SamInfo3 *info3 = NULL;
 
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 87882c3ce4e..19ae0aa30ea 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -316,10 +316,10 @@ static NTSTATUS cmd_samr_query_user(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol, domain_pol, user_pol;
 	NTSTATUS status, result;
-	uint32 info_level = 21;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t info_level = 21;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	union samr_UserInfo *info = NULL;
-	uint32 user_rid = 0;
+	uint32_t user_rid = 0;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if ((argc < 2) || (argc > 4)) {
@@ -539,9 +539,9 @@ static NTSTATUS cmd_samr_query_group(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol, domain_pol, group_pol;
 	NTSTATUS status, result;
 	enum samr_GroupInfoEnum info_level = GROUPINFOALL;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	union samr_GroupInfo *group_info = NULL;
-	uint32 group_rid;
+	uint32_t group_rid;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if ((argc < 2) || (argc > 4)) {
@@ -624,8 +624,8 @@ static NTSTATUS cmd_samr_query_usergroups(struct rpc_pipe_client *cli,
 				domain_pol,
 				user_pol;
 	NTSTATUS status, result;
-	uint32 			user_rid;
-	uint32			access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t 		user_rid;
+	uint32_t		access_mask = MAXIMUM_ALLOWED_ACCESS;
 	int 			i;
 	struct samr_RidWithAttributeArray *rid_array = NULL;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -710,8 +710,8 @@ static NTSTATUS cmd_samr_query_useraliases(struct rpc_pipe_client *cli,
 	struct policy_handle 		connect_pol, domain_pol;
 	NTSTATUS status, result;
 	struct dom_sid                *sids;
-	uint32_t                     num_sids;
-	uint32			access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t                num_sids;
+	uint32_t		access_mask = MAXIMUM_ALLOWED_ACCESS;
 	int 			i;
 	struct lsa_SidArray sid_array;
 	struct samr_Ids alias_rids;
@@ -801,8 +801,8 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol, domain_pol, group_pol;
 	NTSTATUS status, result;
-	uint32 group_rid;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t group_rid;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	int i;
 	unsigned int old_timeout;
 	struct samr_RidAttrArray *rids = NULL;
@@ -893,10 +893,10 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol;
 	struct policy_handle domain_pol = { 0, };
 	NTSTATUS status, result;
-	uint32 start_idx, num_dom_users, i;
+	uint32_t start_idx, num_dom_users, i;
 	struct samr_SamArray *dom_users = NULL;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
-	uint32 acb_mask = ACB_NORMAL;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t acb_mask = ACB_NORMAL;
 	uint32_t size = 0xffff;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -983,8 +983,8 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol;
 	struct policy_handle domain_pol = { 0, };
 	NTSTATUS status, result;
-	uint32 start_idx, num_dom_groups, i;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t start_idx, num_dom_groups, i;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct samr_SamArray *dom_groups = NULL;
 	uint32_t size = 0xffff;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -1067,8 +1067,8 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol;
 	struct policy_handle domain_pol = { 0, };
 	NTSTATUS status, result;
-	uint32 start_idx, num_als_groups, i;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t start_idx, num_als_groups, i;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct samr_SamArray *als_groups = NULL;
 	uint32_t size = 0xffff;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -1149,8 +1149,8 @@ static NTSTATUS cmd_samr_enum_domains(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol;
 	NTSTATUS status, result;
-	uint32 start_idx, size, num_entries, i;
-	uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
+	uint32_t start_idx, size, num_entries, i;
+	uint32_t access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
 	struct samr_SamArray *sam = NULL;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -1215,8 +1215,8 @@ static NTSTATUS cmd_samr_query_aliasmem(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol, domain_pol, alias_pol;
 	NTSTATUS status, result;
-	uint32 alias_rid, i;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t alias_rid, i;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct lsa_SidArray sid_array;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -1403,8 +1403,8 @@ static NTSTATUS cmd_samr_delete_alias(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol, domain_pol, alias_pol;
 	NTSTATUS status, result;
-	uint32 alias_rid;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t alias_rid;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if (argc != 3) {
@@ -1510,9 +1510,9 @@ static NTSTATUS cmd_samr_query_dispinfo_internal(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
-	uint32 start_idx=0, max_entries=250, max_size = 0xffff, num_entries = 0, i;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
-	uint32 info_level = 1;
+	uint32_t start_idx=0, max_entries=250, max_size = 0xffff, num_entries = 0, i;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t info_level = 1;
 	union samr_DispInfo info;
 	int loop_count = 0;
 	bool got_params = False; /* Use get_query_dispinfo_params() or not? */
@@ -1715,8 +1715,8 @@ static NTSTATUS cmd_samr_query_dominfo(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
-	uint32 switch_level = 2;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t switch_level = 2;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	union samr_DomainInfo *info = NULL;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -1830,9 +1830,9 @@ static NTSTATUS cmd_samr_create_dom_user(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol, domain_pol, user_pol;
 	NTSTATUS status, result;
 	struct lsa_String acct_name;
-	uint32 acb_info;
-	uint32 acct_flags, user_rid;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t acb_info;
+	uint32_t acct_flags, user_rid;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	uint32_t access_granted = 0;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -1919,7 +1919,7 @@ static NTSTATUS cmd_samr_create_dom_group(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol, domain_pol, group_pol;
 	NTSTATUS status, result;
 	struct lsa_String grp_name;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	uint32_t rid = 0;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -1996,7 +1996,7 @@ static NTSTATUS cmd_samr_create_dom_alias(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol, domain_pol, alias_pol;
 	NTSTATUS status, result;
 	struct lsa_String alias_name;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	uint32_t rid = 0;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
@@ -2074,7 +2074,7 @@ static NTSTATUS cmd_samr_lookup_names(struct rpc_pipe_client *cli,
 {
 	NTSTATUS status, result;
 	struct policy_handle connect_pol, domain_pol;
-	uint32 num_names;
+	uint32_t num_names;
 	struct samr_Ids rids, name_types;
 	int i;
 	struct lsa_String *names = NULL;
@@ -2197,7 +2197,7 @@ static NTSTATUS cmd_samr_lookup_rids(struct rpc_pipe_client *cli,
 
 	num_rids = argc - 2;
 
-	if ((rids = talloc_array(mem_ctx, uint32, num_rids)) == NULL) {
+	if ((rids = talloc_array(mem_ctx, uint32_t, num_rids)) == NULL) {
 		dcerpc_samr_Close(b, mem_ctx, &domain_pol, &result);
 		dcerpc_samr_Close(b, mem_ctx, &connect_pol, &result);
 		status = NT_STATUS_NO_MEMORY;
@@ -2251,7 +2251,7 @@ static NTSTATUS cmd_samr_delete_dom_group(struct rpc_pipe_client *cli,
 {
 	NTSTATUS status, result;
 	struct policy_handle connect_pol, domain_pol, group_pol;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if ((argc < 2) || (argc > 3)) {
@@ -2362,7 +2362,7 @@ static NTSTATUS cmd_samr_delete_dom_user(struct rpc_pipe_client *cli,
 {
 	NTSTATUS status, result;
 	struct policy_handle connect_pol, domain_pol, user_pol;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if ((argc < 2) || (argc > 3)) {
@@ -2474,8 +2474,8 @@ static NTSTATUS cmd_samr_query_sec_obj(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol, domain_pol, user_pol, *pol;
 	NTSTATUS status, result;
-	uint32 sec_info = SECINFO_DACL;
-	uint32 user_rid = 0;
+	uint32_t sec_info = SECINFO_DACL;
+	uint32_t user_rid = 0;
 	TALLOC_CTX *ctx = NULL;
 	struct sec_desc_buf *sec_desc_buf=NULL;
 	bool domain = False;
@@ -2689,7 +2689,7 @@ static NTSTATUS cmd_samr_lookup_domain(struct rpc_pipe_client *cli,
 {
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	fstring sid_string;
 	struct lsa_String domain_name;
 	struct dom_sid *sid = NULL;
@@ -2759,7 +2759,7 @@ static NTSTATUS cmd_samr_chgpasswd(struct rpc_pipe_client *cli,
 	struct policy_handle user_pol = { 0, };
 	NTSTATUS status, result;
 	const char *user, *oldpass, *newpass;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct samr_Ids rids, types;
 	struct lsa_String lsa_acct_name;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
@@ -2870,7 +2870,7 @@ static NTSTATUS cmd_samr_chgpasswd2(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
 	const char *user, *oldpass, *newpass;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if (argc < 3) {
@@ -2934,7 +2934,7 @@ static NTSTATUS cmd_samr_chgpasswd3(struct rpc_pipe_client *cli,
 	struct policy_handle connect_pol, domain_pol;
 	NTSTATUS status, result;
 	const char *user, *oldpass, *newpass;
-	uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
+	uint32_t access_mask = MAXIMUM_ALLOWED_ACCESS;
 	struct samr_DomInfo1 *info = NULL;
 	struct userPwdChangeFailureInformation *reject = NULL;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
diff --git a/source3/rpcclient/cmd_shutdown.c b/source3/rpcclient/cmd_shutdown.c
index 8db09fef2df..7cf4a30c575 100644
--- a/source3/rpcclient/cmd_shutdown.c
+++ b/source3/rpcclient/cmd_shutdown.c
@@ -34,7 +34,7 @@ static NTSTATUS cmd_shutdown_init(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 {
 	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 	fstring msg;
-	uint32 timeout = 20;
+	uint32_t timeout = 20;
 	bool force = False;
 	bool reboot = False;
 	int opt;
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index e2b9fc46686..3191e80ffac 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -770,7 +770,7 @@ static void display_reg_value(const char *name, enum winreg_Type type, DATA_BLOB
 
 	switch(type) {
 	case REG_DWORD:
-		if (blob.length == sizeof(uint32)) {
+		if (blob.length == sizeof(uint32_t)) {
 			printf("%s: REG_DWORD: 0x%08x\n", name, IVAL(blob.data,0));
 		} else {
 			printf("%s: REG_DWORD: <invalid>\n", name);
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index e5fa0656737..6ad03d17a5c 100644
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -28,7 +28,7 @@
 
 /* Display server query info */
 
-static char *get_server_type_str(uint32 type)
+static char *get_server_type_str(uint32_t type)
 {
 	static fstring typestr;
 	int i;
@@ -133,7 +133,7 @@ static char *get_server_type_str(uint32 type)
 	return typestr;
 }
 
-static void display_server(const char *sname, uint32 type, const char *comment)
+static void display_server(const char *sname, uint32_t type, const char *comment)
 {
 	printf("\t%-15.15s%-20s %s\n", sname, get_server_type_str(type), 
 	       comment);
@@ -171,7 +171,7 @@ static WERROR cmd_srvsvc_srv_query_info(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
                                           int argc, const char **argv)
 {
-	uint32 info_level = 101;
+	uint32_t info_level = 101;
 	union srvsvc_NetSrvInfo info;
 	WERROR result;
 	NTSTATUS status;
@@ -258,7 +258,7 @@ static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
 					    int argc, const char **argv,
 					    uint32_t opcode)
 {
-	uint32 info_level = 2;
+	uint32_t info_level = 2;
 	struct srvsvc_NetShareInfoCtr info_ctr;
 	struct srvsvc_NetShareCtr0 ctr0;
 	struct srvsvc_NetShareCtr1 ctr1;
@@ -276,7 +276,7 @@ static WERROR cmd_srvsvc_net_share_enum_int(struct rpc_pipe_client *cli,
 	uint32_t count = 0;
 	uint32_t resume_handle = 0;
 	uint32_t *resume_handle_p = NULL;
-	uint32 preferred_len = 0xffffffff, i;
+	uint32_t preferred_len = 0xffffffff, i;
 	struct dcerpc_binding_handle *b = cli->binding_handle;
 
 	if (argc > 3) {
@@ -420,7 +420,7 @@ static WERROR cmd_srvsvc_net_share_get_info(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
 					    int argc, const char **argv)
 {
-	uint32 info_level = 502;
+	uint32_t info_level = 502;
 	union srvsvc_NetShareInfo info;
 	WERROR result;
 	NTSTATUS status;
@@ -474,7 +474,7 @@ static WERROR cmd_srvsvc_net_share_set_info(struct rpc_pipe_client *cli,
 					    TALLOC_CTX *mem_ctx,
 					    int argc, const char **argv)
 {
-	uint32 info_level = 502;
+	uint32_t info_level = 502;
 	union srvsvc_NetShareInfo info_get;
 	WERROR result;
 	NTSTATUS status;
@@ -576,12 +576,12 @@ static WERROR cmd_srvsvc_net_file_enum(struct rpc_pipe_client *cli,
 					 TALLOC_CTX *mem_ctx,
 					 int argc, const char **argv)
 {
-	uint32 info_level = 3;
+	uint32_t info_level = 3;
 	struct srvsvc_NetFileInfoCtr info_ctr;
 	struct srvsvc_NetFileCtr3 ctr3;
 	WERROR result;
 	NTSTATUS status;
-	uint32 preferred_len = 0xffff;
+	uint32_t preferred_len = 0xffff;
 	uint32_t total_entries = 0;
 	uint32_t resume_handle = 0;
 	struct dcerpc_binding_handle *b = cli->binding_handle;