diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-31 09:32:52 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-08-31 10:20:14 +1000 |
| commit | 8c15cf54ae797d8f01a61228d367b5a785f06d98 (patch) | |
| tree | ab0ad383708bccfaf268cc11a3cc1121f6d8bfbc /source3/lib | |
| parent | 6beb5563f3464cf32109c9069b39a5cf71134321 (diff) | |
| download | samba-8c15cf54ae797d8f01a61228d367b5a785f06d98.tar.gz samba-8c15cf54ae797d8f01a61228d367b5a785f06d98.tar.bz2 samba-8c15cf54ae797d8f01a61228d367b5a785f06d98.zip | |
s3-auth Rename NT_USER_TOKEN user_sids -> sids
This is closer to the struct security_token from security.idl
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/util_nttoken.c | 18 | ||||
| -rw-r--r-- | source3/lib/util_sid.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source3/lib/util_nttoken.c b/source3/lib/util_nttoken.c index 04c7e4f157..60ce8e7618 100644 --- a/source3/lib/util_nttoken.c +++ b/source3/lib/util_nttoken.c @@ -44,11 +44,11 @@ NT_USER_TOKEN *dup_nt_token(TALLOC_CTX *mem_ctx, const NT_USER_TOKEN *ptoken) return NULL; } - if (ptoken->user_sids && ptoken->num_sids) { - token->user_sids = (struct dom_sid *)talloc_memdup( - token, ptoken->user_sids, sizeof(struct dom_sid) * ptoken->num_sids ); + if (ptoken->sids && ptoken->num_sids) { + token->sids = (struct dom_sid *)talloc_memdup( + token, ptoken->sids, sizeof(struct dom_sid) * ptoken->num_sids ); - if (token->user_sids == NULL) { + if (token->sids == NULL) { DEBUG(0, ("talloc_memdup failed\n")); TALLOC_FREE(token); return NULL; @@ -88,8 +88,8 @@ NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx, for (i=0; i < token_1->num_sids; i++) { status = add_sid_to_array_unique(mem_ctx, - &token_1->user_sids[i], - &token->user_sids, + &token_1->sids[i], + &token->sids, &token->num_sids); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(token); @@ -99,8 +99,8 @@ NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx, for (i=0; i < token_2->num_sids; i++) { status = add_sid_to_array_unique(mem_ctx, - &token_2->user_sids[i], - &token->user_sids, + &token_2->sids[i], + &token->sids, &token->num_sids); if (!NT_STATUS_IS_OK(status)) { TALLOC_FREE(token); @@ -125,7 +125,7 @@ bool token_sid_in_ace(const NT_USER_TOKEN *token, const struct security_ace *ace size_t i; for (i = 0; i < token->num_sids; i++) { - if (sid_equal(&ace->trustee, &token->user_sids[i])) + if (sid_equal(&ace->trustee, &token->sids[i])) return true; } diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c index 31a4c06c24..3874d3d20c 100644 --- a/source3/lib/util_sid.c +++ b/source3/lib/util_sid.c @@ -673,7 +673,7 @@ bool is_sid_in_token(const NT_USER_TOKEN *token, const struct dom_sid *sid) int i; for (i=0; i<token->num_sids; i++) { - if (sid_compare(sid, &token->user_sids[i]) == 0) + if (sid_compare(sid, &token->sids[i]) == 0) return true; } return false; |