From: Volker Lendecke <vl@samba.org>
Date: Sun, 25 Jul 2021 08:22:37 +0000 (+0200)
Subject: net: Align some integer types
X-Git-Tag: ldb-2.5.0~1013
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de1b95791cbb9b3198b8211db41bc07becbe2ef5;p=thirdparty%2Fsamba.git

net: Align some integer types

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 92603835eb2..ca91e1696c3 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -1134,7 +1134,7 @@ static int rpc_user_info(struct net_context *c, int argc, const char **argv)
 	struct GROUP_USERS_INFO_0 *u0 = NULL;
 	uint32_t entries_read = 0;
 	uint32_t total_entries = 0;
-	int i;
+	uint32_t i;
 
 
 	if (argc < 1 || c->display_usage) {
@@ -1798,7 +1798,7 @@ static NTSTATUS rpc_group_delete_internals(struct net_context *c,
 	uint32_t group_rid;
 	struct samr_RidAttrArray *rids = NULL;
 	/* char **names; */
-	int i;
+	uint32_t i;
 	/* struct samr_RidWithAttribute *user_gids; */
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -3043,7 +3043,7 @@ static NTSTATUS rpc_list_group_members(struct net_context *c,
 	NTSTATUS result, status;
 	struct policy_handle group_pol;
 	uint32_t num_members, *group_rids;
-	int i;
+	uint32_t i;
 	struct samr_RidAttrArray *rids = NULL;
 	struct lsa_Strings names;
 	struct samr_Ids types;
@@ -3077,7 +3077,7 @@ static NTSTATUS rpc_list_group_members(struct net_context *c,
 	group_rids = rids->rids;
 
 	while (num_members > 0) {
-		int this_time = 512;
+		uint32_t this_time = 512;
 
 		if (num_members < this_time)
 			this_time = num_members;
@@ -3145,7 +3145,7 @@ static NTSTATUS rpc_list_alias_members(struct net_context *c,
 	char **domains;
 	char **names;
 	enum lsa_SidType *types;
-	int i;
+	uint32_t i;
 	struct lsa_SidArray sid_array;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -4700,7 +4700,7 @@ static NTSTATUS rpc_aliaslist_dump(struct net_context *c,
 				int argc,
 				const char **argv)
 {
-	int i;
+	uint32_t i;
 	NTSTATUS result;
 	struct policy_handle lsa_pol;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
@@ -4841,7 +4841,7 @@ struct user_token {
 
 static void dump_user_token(struct user_token *token)
 {
-	int i;
+	uint32_t i;
 
 	d_printf("%s\n", token->name);
 
@@ -4854,7 +4854,7 @@ static void dump_user_token(struct user_token *token)
 
 static bool is_alias_member(struct dom_sid *sid, struct full_alias *alias)
 {
-	int i;
+	uint32_t i;
 
 	for (i=0; i<alias->num_members; i++) {
 		if (dom_sid_equal(sid, &alias->members[i])) {
@@ -6872,7 +6872,6 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc,
 
 	/* trusted domains listing variables */
 	unsigned int enum_ctx = 0;
-	int i;
 	struct lsa_DomainList dom_list;
 	fstring pdc_name;
 	struct dcerpc_binding_handle *b;
@@ -6967,6 +6966,8 @@ static int rpc_trustdom_vampire(struct net_context *c, int argc,
 	d_printf(_("Vampire trusted domains:\n\n"));
 
 	do {
+		uint32_t i;
+
 		nt_status = dcerpc_lsa_EnumTrustDom(b, mem_ctx,
 						    &connect_hnd,
 						    &enum_ctx,
@@ -7046,7 +7047,7 @@ static int rpc_trustdom_list(struct net_context *c, int argc, const char **argv)
 
 	/* trusted domains listing variables */
 	unsigned int num_domains, enum_ctx = 0;
-	int i;
+	uint32_t i;
 	struct lsa_DomainList dom_list;
 	fstring pdc_name;
 	bool found_domain;
diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index d4cc5eabbe3..57267b29e9b 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -103,7 +103,7 @@ static NTSTATUS enum_privileges(struct rpc_pipe_client *pipe_hnd,
 	NTSTATUS status, result;
 	uint32_t enum_context = 0;
 	uint32_t pref_max_length=0x1000;
-	int i;
+	uint32_t i;
 	uint16_t lang_id=0;
 	uint16_t lang_id_sys=0;
 	uint16_t lang_id_desc;
@@ -171,7 +171,7 @@ static NTSTATUS check_privilege_for_user(struct rpc_pipe_client *pipe_hnd,
 {
 	NTSTATUS status, result;
 	struct lsa_RightSet rights;
-	int i;
+	uint32_t i;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
 	status = dcerpc_lsa_EnumAccountRights(b, ctx,
@@ -209,7 +209,7 @@ static NTSTATUS enum_privileges_for_user(struct rpc_pipe_client *pipe_hnd,
 {
 	NTSTATUS status, result;
 	struct lsa_RightSet rights;
-	int i;
+	uint32_t i;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
 	status = dcerpc_lsa_EnumAccountRights(b, ctx,
@@ -245,7 +245,7 @@ static NTSTATUS enum_accounts_for_privilege(struct rpc_pipe_client *pipe_hnd,
 	uint32_t enum_context=0;
 	uint32_t pref_max_length=0x1000;
 	struct lsa_SidArray sid_array;
-	int i;
+	uint32_t i;
 	fstring name;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;
 
@@ -298,7 +298,7 @@ static NTSTATUS enum_privileges_for_accounts(struct rpc_pipe_client *pipe_hnd,
 	uint32_t enum_context=0;
 	uint32_t pref_max_length=0x1000;
 	struct lsa_SidArray sid_array;
-	int i;
+	uint32_t i;
 	fstring name;
 	struct dcerpc_binding_handle *b = pipe_hnd->binding_handle;