From 2ee3cca4ffd60d091ca5fe8035f90969f6b91cc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Tue, 9 Mar 2010 17:54:12 +0100 Subject: [PATCH] s4:winbind - use "unsigned" variables where possible --- source4/winbind/wb_async_helpers.c | 20 ++++++++++---------- source4/winbind/wb_cmd_list_trustdom.c | 8 ++++---- source4/winbind/wb_cmd_userdomgroups.c | 8 ++++---- source4/winbind/wb_cmd_usersids.c | 12 ++++++------ source4/winbind/wb_samba3_cmd.c | 6 +++--- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/source4/winbind/wb_async_helpers.c b/source4/winbind/wb_async_helpers.c index f23e05d9eb7..6eced45c15f 100644 --- a/source4/winbind/wb_async_helpers.c +++ b/source4/winbind/wb_async_helpers.c @@ -31,7 +31,7 @@ struct lsa_lookupsids_state { struct composite_context *ctx; - int num_sids; + uint32_t num_sids; struct lsa_LookupSids r; struct lsa_SidArray sids; struct lsa_TransNameArray names; @@ -45,13 +45,13 @@ static void lsa_lookupsids_recv_names(struct rpc_request *req); struct composite_context *wb_lsa_lookupsids_send(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *lsa_pipe, struct policy_handle *handle, - int num_sids, + uint32_t num_sids, const struct dom_sid **sids) { struct composite_context *result; struct rpc_request *req; struct lsa_lookupsids_state *state; - int i; + uint32_t i; result = composite_create(mem_ctx, lsa_pipe->conn->event_ctx); if (result == NULL) goto failed; @@ -105,7 +105,7 @@ static void lsa_lookupsids_recv_names(struct rpc_request *req) struct lsa_lookupsids_state *state = talloc_get_type(req->async.private_data, struct lsa_lookupsids_state); - int i; + uint32_t i; state->ctx->status = dcerpc_lsa_LookupSids_recv(req); if (!composite_is_ok(state->ctx)) return; @@ -194,7 +194,7 @@ static void lsa_lookupnames_recv_sids(struct rpc_request *req); struct composite_context *wb_lsa_lookupnames_send(TALLOC_CTX *mem_ctx, struct dcerpc_pipe *lsa_pipe, struct policy_handle *handle, - int num_names, + uint32_t num_names, const char **names) { struct composite_context *result; @@ -202,7 +202,7 @@ struct composite_context *wb_lsa_lookupnames_send(TALLOC_CTX *mem_ctx, struct lsa_lookupnames_state *state; struct lsa_String *lsa_names; - int i; + uint32_t i; result = composite_create(mem_ctx, lsa_pipe->conn->event_ctx); if (result == NULL) goto failed; @@ -254,7 +254,7 @@ static void lsa_lookupnames_recv_sids(struct rpc_request *req) struct lsa_lookupnames_state *state = talloc_get_type(req->async.private_data, struct lsa_lookupnames_state); - int i; + uint32_t i; state->ctx->status = dcerpc_lsa_LookupNames_recv(req); if (!composite_is_ok(state->ctx)) return; @@ -316,7 +316,7 @@ struct samr_getuserdomgroups_state { struct composite_context *ctx; struct dcerpc_pipe *samr_pipe; - int num_rids; + uint32_t num_rids; uint32_t *rids; struct samr_RidWithAttributeArray *rid_array; @@ -425,13 +425,13 @@ static void samr_usergroups_recv_close(struct rpc_request *req) NTSTATUS wb_samr_userdomgroups_recv(struct composite_context *ctx, TALLOC_CTX *mem_ctx, - int *num_rids, uint32_t **rids) + uint32_t *num_rids, uint32_t **rids) { struct samr_getuserdomgroups_state *state = talloc_get_type(ctx->private_data, struct samr_getuserdomgroups_state); - int i; + uint32_t i; NTSTATUS status = composite_wait(ctx); if (!NT_STATUS_IS_OK(status)) goto done; diff --git a/source4/winbind/wb_cmd_list_trustdom.c b/source4/winbind/wb_cmd_list_trustdom.c index c905ff46168..fe27809c28b 100644 --- a/source4/winbind/wb_cmd_list_trustdom.c +++ b/source4/winbind/wb_cmd_list_trustdom.c @@ -33,7 +33,7 @@ struct cmd_list_trustdom_state { struct composite_context *ctx; struct dcerpc_pipe *lsa_pipe; struct policy_handle *lsa_policy; - int num_domains; + uint32_t num_domains; struct wb_dom_info **domains; uint32_t resume_handle; @@ -124,7 +124,7 @@ static void cmd_list_trustdoms_recv_doms(struct rpc_request *req) struct cmd_list_trustdom_state *state = talloc_get_type(req->async.private_data, struct cmd_list_trustdom_state); - int i, old_num_domains; + uint32_t i, old_num_domains; state->ctx->status = dcerpc_lsa_EnumTrustDom_recv(req); if (!composite_is_ok(state->ctx)) return; @@ -147,7 +147,7 @@ static void cmd_list_trustdoms_recv_doms(struct rpc_request *req) composite_nomem(state->domains, state->ctx)) return; for (i=0; ir.out.domains->count; i++) { - int j = i+old_num_domains; + uint32_t j = i+old_num_domains; state->domains[j] = talloc(state->domains, struct wb_dom_info); if (composite_nomem(state->domains[i], state->ctx)) return; @@ -180,7 +180,7 @@ static void cmd_list_trustdoms_recv_doms(struct rpc_request *req) NTSTATUS wb_cmd_list_trustdoms_recv(struct composite_context *ctx, TALLOC_CTX *mem_ctx, - int *num_domains, + uint32_t *num_domains, struct wb_dom_info ***domains) { NTSTATUS status = composite_wait(ctx); diff --git a/source4/winbind/wb_cmd_userdomgroups.c b/source4/winbind/wb_cmd_userdomgroups.c index 649fe489cc6..c1258a94d27 100644 --- a/source4/winbind/wb_cmd_userdomgroups.c +++ b/source4/winbind/wb_cmd_userdomgroups.c @@ -30,7 +30,7 @@ struct cmd_userdomgroups_state { struct composite_context *ctx; struct dom_sid *dom_sid; uint32_t user_rid; - int num_rids; + uint32_t num_rids; uint32_t *rids; }; @@ -104,12 +104,12 @@ static void userdomgroups_recv_rids(struct composite_context *ctx) NTSTATUS wb_cmd_userdomgroups_recv(struct composite_context *c, TALLOC_CTX *mem_ctx, - int *num_sids, struct dom_sid ***sids) + uint32_t *num_sids, struct dom_sid ***sids) { struct cmd_userdomgroups_state *state = talloc_get_type(c->private_data, struct cmd_userdomgroups_state); - int i; + uint32_t i; NTSTATUS status; status = composite_wait(c); @@ -139,7 +139,7 @@ done: NTSTATUS wb_cmd_userdomgroups(TALLOC_CTX *mem_ctx, struct wbsrv_service *service, const struct dom_sid *sid, - int *num_sids, struct dom_sid ***sids) + uint32_t *num_sids, struct dom_sid ***sids) { struct composite_context *c = wb_cmd_userdomgroups_send(mem_ctx, service, sid); diff --git a/source4/winbind/wb_cmd_usersids.c b/source4/winbind/wb_cmd_usersids.c index cc541ef6e57..c062d362b46 100644 --- a/source4/winbind/wb_cmd_usersids.c +++ b/source4/winbind/wb_cmd_usersids.c @@ -34,14 +34,14 @@ struct cmd_usersids_state { struct composite_context *ctx; struct wbsrv_service *service; struct dom_sid *user_sid; - int num_domgroups; + uint32_t num_domgroups; struct dom_sid **domgroups; struct lsa_SidArray lsa_sids; struct samr_Ids rids; struct samr_GetAliasMembership r; - int num_sids; + uint32_t num_sids; struct dom_sid **sids; }; @@ -104,7 +104,7 @@ static void usersids_recv_domain(struct composite_context *ctx) struct cmd_usersids_state); struct rpc_request *req; struct wbsrv_domain *domain; - int i; + uint32_t i; state->ctx->status = wb_sid2domain_recv(ctx, &domain); if (!composite_is_ok(state->ctx)) return; @@ -136,7 +136,7 @@ static void usersids_recv_aliases(struct rpc_request *req) struct cmd_usersids_state *state = talloc_get_type(req->async.private_data, struct cmd_usersids_state); - int i; + uint32_t i; state->ctx->status = dcerpc_samr_GetAliasMembership_recv(req); if (!composite_is_ok(state->ctx)) return; @@ -168,7 +168,7 @@ static void usersids_recv_aliases(struct rpc_request *req) NTSTATUS wb_cmd_usersids_recv(struct composite_context *ctx, TALLOC_CTX *mem_ctx, - int *num_sids, struct dom_sid ***sids) + uint32_t *num_sids, struct dom_sid ***sids) { NTSTATUS status = composite_wait(ctx); if (NT_STATUS_IS_OK(status)) { @@ -184,7 +184,7 @@ NTSTATUS wb_cmd_usersids_recv(struct composite_context *ctx, NTSTATUS wb_cmd_usersids(TALLOC_CTX *mem_ctx, struct wbsrv_service *service, const struct dom_sid *sid, - int *num_sids, struct dom_sid ***sids) + uint32_t *num_sids, struct dom_sid ***sids) { struct composite_context *c = wb_cmd_usersids_send(mem_ctx, service, sid); diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c index 95ef7d14b9f..d245d7ae37d 100644 --- a/source4/winbind/wb_samba3_cmd.c +++ b/source4/winbind/wb_samba3_cmd.c @@ -383,7 +383,7 @@ static void userdomgroups_recv_groups(struct composite_context *ctx) struct wbsrv_samba3_call *s3call = talloc_get_type(ctx->async.private_data, struct wbsrv_samba3_call); - int i, num_sids; + uint32_t i, num_sids; struct dom_sid **sids; char *sids_string; NTSTATUS status; @@ -450,7 +450,7 @@ static void usersids_recv_sids(struct composite_context *ctx) struct wbsrv_samba3_call *s3call = talloc_get_type(ctx->async.private_data, struct wbsrv_samba3_call); - int i, num_sids; + uint32_t i, num_sids; struct dom_sid **sids; char *sids_string; NTSTATUS status; @@ -830,7 +830,7 @@ static void list_trustdom_recv_doms(struct composite_context *ctx) struct wbsrv_samba3_call *s3call = talloc_get_type(ctx->async.private_data, struct wbsrv_samba3_call); - int i, num_domains; + uint32_t i, num_domains; struct wb_dom_info **domains; NTSTATUS status; char *result; -- 2.11.4.GIT