From 7c6ca95bec5141707d4f19e802062731d6789cc5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 14 Aug 2010 13:30:51 +1000 Subject: s4:security Remove use of user_sid and group_sid from struct security_token This makes the structure more like Samba3's NT_USER_TOKEN --- source4/auth/system_session.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/system_session.c b/source4/auth/system_session.c index 386f066de4..08ddb68f5d 100644 --- a/source4/auth/system_session.c +++ b/source4/auth/system_session.c @@ -51,13 +51,10 @@ static NTSTATUS create_token(TALLOC_CTX *mem_ctx, ptoken->sids = talloc_array(ptoken, struct dom_sid *, n_groupSIDs + 5); NT_STATUS_HAVE_NO_MEMORY(ptoken->sids); - ptoken->user_sid = talloc_reference(ptoken, user_sid); - ptoken->group_sid = talloc_reference(ptoken, group_sid); + ptoken->sids[PRIMARY_USER_SID_INDEX] = talloc_reference(ptoken, user_sid); + ptoken->sids[PRIMARY_GROUP_SID_INDEX] = talloc_reference(ptoken, group_sid); ptoken->privilege_mask = 0; - ptoken->sids[0] = ptoken->user_sid; - ptoken->sids[1] = ptoken->group_sid; - /* * Finally add the "standard" SIDs. * The only difference between guest and "anonymous" @@ -93,7 +90,7 @@ static NTSTATUS create_token(TALLOC_CTX *mem_ctx, *token = ptoken; /* Shortcuts to prevent recursion and avoid lookups */ - if (ptoken->user_sid == NULL) { + if (ptoken->sids == NULL) { ptoken->privilege_mask = 0; return NT_STATUS_OK; } @@ -337,12 +334,10 @@ static NTSTATUS create_admin_token(TALLOC_CTX *mem_ctx, ptoken->sids = talloc_array(ptoken, struct dom_sid *, n_groupSIDs + 3); NT_STATUS_HAVE_NO_MEMORY(ptoken->sids); - ptoken->user_sid = talloc_reference(ptoken, user_sid); - ptoken->group_sid = talloc_reference(ptoken, group_sid); ptoken->privilege_mask = 0; + ptoken->sids[PRIMARY_USER_SID_INDEX] = talloc_reference(ptoken, user_sid); + ptoken->sids[PRIMARY_GROUP_SID_INDEX] = talloc_reference(ptoken, group_sid); - ptoken->sids[0] = ptoken->user_sid; - ptoken->sids[1] = ptoken->group_sid; ptoken->sids[2] = dom_sid_parse_talloc(ptoken->sids, SID_NT_AUTHENTICATED_USERS); NT_STATUS_HAVE_NO_MEMORY(ptoken->sids[2]); ptoken->num_sids = 3; -- cgit