diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-26 20:54:13 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:05 +1000 |
| commit | 4bf783d4d6693f927f5e7ef7a9855766c91983f2 (patch) | |
| tree | f6cbe7bdc734997850ca85c6defd4c53a7bad148 /source3/winbindd/winbindd_ads.c | |
| parent | 6a0176b07da0b416bc9d750ddea92c612849597c (diff) | |
| download | samba-4bf783d4d6693f927f5e7ef7a9855766c91983f2.tar.gz samba-4bf783d4d6693f927f5e7ef7a9855766c91983f2.tar.bz2 samba-4bf783d4d6693f927f5e7ef7a9855766c91983f2.zip | |
s3-auth Change type of num_sids to uint32_t
size_t is overkill here, and in struct security_token in the num_sids
is uint32_t.
This includes a change to the prototype of add_sid_to_array()
and add_sid_to_array_unique(), which has had a number of
consequnetial changes as I try to sort out all the callers using
a pointer to the number of sids.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/winbindd/winbindd_ads.c')
| -rw-r--r-- | source3/winbindd/winbindd_ads.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index 1d9f1f0174..367d38ba15 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -614,7 +614,7 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, const char *user_dn, struct dom_sid *primary_group, - size_t *p_num_groups, struct dom_sid **user_sids) + uint32_t *p_num_groups, struct dom_sid **user_sids) { ADS_STATUS rc; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; @@ -625,7 +625,7 @@ static NTSTATUS lookup_usergroups_member(struct winbindd_domain *domain, ADS_STRUCT *ads; const char *group_attrs[] = {"objectSid", NULL}; char *escaped_dn; - size_t num_groups = 0; + uint32_t num_groups = 0; DEBUG(3,("ads: lookup_usergroups_member\n")); @@ -721,14 +721,14 @@ static NTSTATUS lookup_usergroups_memberof(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, const char *user_dn, struct dom_sid *primary_group, - size_t *p_num_groups, + uint32_t *p_num_groups, struct dom_sid **user_sids) { ADS_STATUS rc; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; ADS_STRUCT *ads; const char *attrs[] = {"memberOf", NULL}; - size_t num_groups = 0; + uint32_t num_groups = 0; struct dom_sid *group_sids = NULL; int i; char **strings = NULL; @@ -846,7 +846,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, struct dom_sid primary_group; uint32 primary_group_rid; NTSTATUS status = NT_STATUS_UNSUCCESSFUL; - size_t num_groups = 0; + uint32_t num_groups = 0; DEBUG(3,("ads: lookup_usergroups\n")); *p_num_groups = 0; @@ -931,7 +931,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, status = lookup_usergroups_memberof(domain, mem_ctx, user_dn, &primary_group, &num_groups, user_sids); - *p_num_groups = (uint32)num_groups; + *p_num_groups = num_groups; if (NT_STATUS_IS_OK(status)) { goto done; } @@ -942,7 +942,7 @@ static NTSTATUS lookup_usergroups(struct winbindd_domain *domain, status = lookup_usergroups_member(domain, mem_ctx, user_dn, &primary_group, &num_groups, user_sids); - *p_num_groups = (uint32)num_groups; + *p_num_groups = num_groups; goto done; } |