diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-20 12:15:15 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-08-23 08:50:55 +1000 |
| commit | 6cf29b3e4f3880882eb7df45dbcfaf7bd2b8d9f4 (patch) | |
| tree | 04d4e97f0505568e2ec333e27dcd9e26c3467af4 /source4/auth | |
| parent | abcfc114978fd2d065f800bcfe53f63ab567c069 (diff) | |
| download | samba-6cf29b3e4f3880882eb7df45dbcfaf7bd2b8d9f4.tar.gz samba-6cf29b3e4f3880882eb7df45dbcfaf7bd2b8d9f4.tar.bz2 samba-6cf29b3e4f3880882eb7df45dbcfaf7bd2b8d9f4.zip | |
s4:security Change struct security_token->sids from struct dom_sid * to struct dom_sid
This makes the structure much more like NT_USER_TOKEN in the source3/
code. (The remaining changes are that privilages still need to be merged)
Andrew Bartlett
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/system_session.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/source4/auth/system_session.c b/source4/auth/system_session.c index 4712702e46..bec22c1600 100644 --- a/source4/auth/system_session.c +++ b/source4/auth/system_session.c @@ -48,11 +48,11 @@ static NTSTATUS create_token(TALLOC_CTX *mem_ctx, ptoken = security_token_initialise(mem_ctx); NT_STATUS_HAVE_NO_MEMORY(ptoken); - ptoken->sids = talloc_array(ptoken, struct dom_sid *, n_groupSIDs + 5); + ptoken->sids = talloc_array(ptoken, struct dom_sid, n_groupSIDs + 5); NT_STATUS_HAVE_NO_MEMORY(ptoken->sids); - ptoken->sids[PRIMARY_USER_SID_INDEX] = talloc_reference(ptoken, user_sid); - ptoken->sids[PRIMARY_GROUP_SID_INDEX] = talloc_reference(ptoken, group_sid); + ptoken->sids[PRIMARY_USER_SID_INDEX] = *user_sid; + ptoken->sids[PRIMARY_GROUP_SID_INDEX] = *group_sid; ptoken->privilege_mask = 0; /* @@ -60,15 +60,19 @@ static NTSTATUS create_token(TALLOC_CTX *mem_ctx, * The only difference between guest and "anonymous" * is the addition of Authenticated_Users. */ - ptoken->sids[2] = dom_sid_parse_talloc(ptoken->sids, SID_WORLD); - NT_STATUS_HAVE_NO_MEMORY(ptoken->sids[2]); - ptoken->sids[3] = dom_sid_parse_talloc(ptoken->sids, SID_NT_NETWORK); - NT_STATUS_HAVE_NO_MEMORY(ptoken->sids[3]); + + if (!dom_sid_parse(SID_WORLD, &ptoken->sids[2])) { + return NT_STATUS_INTERNAL_ERROR; + } + if (!dom_sid_parse(SID_NT_NETWORK, &ptoken->sids[3])) { + return NT_STATUS_INTERNAL_ERROR; + } ptoken->num_sids = 4; if (is_authenticated) { - ptoken->sids[4] = dom_sid_parse_talloc(ptoken->sids, SID_NT_AUTHENTICATED_USERS); - NT_STATUS_HAVE_NO_MEMORY(ptoken->sids[4]); + if (!dom_sid_parse(SID_NT_AUTHENTICATED_USERS, &ptoken->sids[4])) { + return NT_STATUS_INTERNAL_ERROR; + } ptoken->num_sids++; } @@ -77,13 +81,13 @@ static NTSTATUS create_token(TALLOC_CTX *mem_ctx, for (check_sid_idx = 1; check_sid_idx < ptoken->num_sids; check_sid_idx++) { - if (dom_sid_equal(ptoken->sids[check_sid_idx], groupSIDs[i])) { + if (dom_sid_equal(&ptoken->sids[check_sid_idx], groupSIDs[i])) { break; } } if (check_sid_idx == ptoken->num_sids) { - ptoken->sids[ptoken->num_sids++] = talloc_reference(ptoken->sids, groupSIDs[i]); + ptoken->sids[ptoken->num_sids++] = *groupSIDs[i]; } } |