From 6ca874f71ad77c82d6e161a3e4772100de2ad6c5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 11 Dec 2004 05:41:19 +0000 Subject: r4147: converted from NT_USER_TOKEN to struct security_token this is mostly just a tidyup, but also adds the privilege_mask, which I will be using shortly in ACL checking. note that I had to move the definition of struct security_token out of security.idl as pidl doesn't yet handle arrays of pointers, and the usual workaround (to use a intermediate structure) would make things too cumbersome for this structure, especially given we never encode it to NDR. (This used to be commit 7b446af09b8050746bfc2c50e9d56aa94397cc1a) --- source4/include/smb.h | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'source4/include/smb.h') diff --git a/source4/include/smb.h b/source4/include/smb.h index 5017384eef..5dc553c3fa 100644 --- a/source4/include/smb.h +++ b/source4/include/smb.h @@ -189,23 +189,14 @@ enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, incorrect parameters - what does it mean? maybe created temporary file? */ #define NTCREATEX_ACTION_UNKNOWN 5 -/* - * The complete list of SIDS belonging to this user. - * Created when a vuid is registered. - * The definition of the user_sids array is as follows : - * - * token->user_sids[0] = primary user SID. - * token->user_sids[1] = primary group SID. - * token->user_sids[2..num_sids] = supplementary group SIDS. - */ - -#define PRIMARY_USER_SID_INDEX 0 -#define PRIMARY_GROUP_SID_INDEX 1 -typedef struct nt_user_token { - size_t num_sids; - struct dom_sid **user_sids; -} NT_USER_TOKEN; +struct security_token { + struct dom_sid *user_sid; + struct dom_sid *group_sid; + uint32_t num_sids; + struct dom_sid **sids; + uint64_t privilege_mask; +}; /* used to hold an arbitrary blob of data */ typedef struct data_blob { -- cgit