diff options
Diffstat (limited to 'source3/winbindd/winbindd_rpc.c')
| -rw-r--r-- | source3/winbindd/winbindd_rpc.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 0111191d83..1515cfa6e3 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -280,11 +280,11 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain, const char *domain_name, const char *name, uint32_t flags, - DOM_SID *sid, + struct dom_sid *sid, enum lsa_SidType *type) { NTSTATUS result; - DOM_SID *sids = NULL; + struct dom_sid *sids = NULL; enum lsa_SidType *types = NULL; char *full_name = NULL; NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL; @@ -337,7 +337,7 @@ static NTSTATUS msrpc_name_to_sid(struct winbindd_domain *domain, */ static NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *sid, + const struct dom_sid *sid, char **domain_name, char **name, enum lsa_SidType *type) @@ -386,7 +386,7 @@ static NTSTATUS msrpc_sid_to_name(struct winbindd_domain *domain, static NTSTATUS msrpc_rids_to_names(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *sid, + const struct dom_sid *sid, uint32 *rids, size_t num_rids, char **domain_name, @@ -395,14 +395,14 @@ static NTSTATUS msrpc_rids_to_names(struct winbindd_domain *domain, { char **domains; NTSTATUS result; - DOM_SID *sids; + struct dom_sid *sids; size_t i; char **ret_names; DEBUG(3, ("rids_to_names [rpc] for domain %s\n", domain->name )); if (num_rids) { - sids = TALLOC_ARRAY(mem_ctx, DOM_SID, num_rids); + sids = TALLOC_ARRAY(mem_ctx, struct dom_sid, num_rids); if (sids == NULL) { return NT_STATUS_NO_MEMORY; } @@ -455,7 +455,7 @@ static NTSTATUS msrpc_rids_to_names(struct winbindd_domain *domain, /* Lookup user information from a rid or username. */ static NTSTATUS query_user(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *user_sid, + const struct dom_sid *user_sid, struct wbint_userinfo *user_info) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -546,8 +546,8 @@ static NTSTATUS query_user(struct winbindd_domain *domain, /* Lookup groups a user is a member of. I wish Unix had a call like this! */ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *user_sid, - uint32 *num_groups, DOM_SID **user_grpsids) + const struct dom_sid *user_sid, + uint32 *num_groups, struct dom_sid **user_grpsids) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; struct policy_handle dom_pol, user_pol; @@ -609,7 +609,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, if (!NT_STATUS_IS_OK(result) || (*num_groups) == 0) return result; - (*user_grpsids) = TALLOC_ARRAY(mem_ctx, DOM_SID, *num_groups); + (*user_grpsids) = TALLOC_ARRAY(mem_ctx, struct dom_sid, *num_groups); if (!(*user_grpsids)) return NT_STATUS_NO_MEMORY; @@ -625,7 +625,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, static NTSTATUS msrpc_lookup_useraliases(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - uint32 num_sids, const DOM_SID *sids, + uint32 num_sids, const struct dom_sid *sids, uint32 *num_aliases, uint32 **alias_rids) { @@ -724,10 +724,10 @@ static NTSTATUS msrpc_lookup_useraliases(struct winbindd_domain *domain, /* Lookup group membership given a rid. */ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, - const DOM_SID *group_sid, + const struct dom_sid *group_sid, enum lsa_SidType type, uint32 *num_names, - DOM_SID **sid_mem, char ***names, + struct dom_sid **sid_mem, char ***names, uint32 **name_types) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -807,7 +807,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, *names = TALLOC_ZERO_ARRAY(mem_ctx, char *, *num_names); *name_types = TALLOC_ZERO_ARRAY(mem_ctx, uint32, *num_names); - *sid_mem = TALLOC_ZERO_ARRAY(mem_ctx, DOM_SID, *num_names); + *sid_mem = TALLOC_ZERO_ARRAY(mem_ctx, struct dom_sid, *num_names); for (j=0;j<(*num_names);j++) sid_compose(&(*sid_mem)[j], &domain->sid, rid_mem[j]); @@ -1183,7 +1183,7 @@ typedef NTSTATUS (*lookup_sids_fn_t)(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *pol, int num_sids, - const DOM_SID *sids, + const struct dom_sid *sids, char ***pdomains, char ***pnames, enum lsa_SidType **ptypes); |