diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-31 11:18:11 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-08-31 11:25:41 +1000 |
| commit | eee63b7e75e6fe3e244285698211da46052e7c18 (patch) | |
| tree | 299549f06a2933445812e6c222f7affbddedf11f /source3/lib | |
| parent | 8c15cf54ae797d8f01a61228d367b5a785f06d98 (diff) | |
| download | samba-eee63b7e75e6fe3e244285698211da46052e7c18.tar.gz samba-eee63b7e75e6fe3e244285698211da46052e7c18.tar.bz2 samba-eee63b7e75e6fe3e244285698211da46052e7c18.zip | |
s3-auth Rename NT_USER_TOKEN privileges -> privilege_mask
This is closer to the struct security_token from security.idl
Andrew Bartlett
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/privileges_basic.c | 4 | ||||
| -rw-r--r-- | source3/lib/util_nttoken.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/lib/privileges_basic.c b/source3/lib/privileges_basic.c index c970478d32..f6080690f7 100644 --- a/source3/lib/privileges_basic.c +++ b/source3/lib/privileges_basic.c @@ -345,7 +345,7 @@ bool user_has_privileges(const NT_USER_TOKEN *token, const SE_PRIV *privilege) if ( !token ) return False; - return is_privilege_assigned( &token->privileges, privilege ); + return is_privilege_assigned( &token->privilege_mask, privilege ); } /**************************************************************************** @@ -358,7 +358,7 @@ bool user_has_any_privilege(NT_USER_TOKEN *token, const SE_PRIV *privilege) if ( !token ) return False; - return is_any_privilege_assigned( &token->privileges, privilege ); + return is_any_privilege_assigned( &token->privilege_mask, privilege ); } /******************************************************************* diff --git a/source3/lib/util_nttoken.c b/source3/lib/util_nttoken.c index 60ce8e7618..737e5ebfc2 100644 --- a/source3/lib/util_nttoken.c +++ b/source3/lib/util_nttoken.c @@ -58,8 +58,8 @@ NT_USER_TOKEN *dup_nt_token(TALLOC_CTX *mem_ctx, const NT_USER_TOKEN *ptoken) /* copy the privileges; don't consider failure to be critical here */ - if ( !se_priv_copy( &token->privileges, &ptoken->privileges ) ) { - DEBUG(0,("dup_nt_token: Failure to copy SE_PRIV!. " + if ( !se_priv_copy( &token->privilege_mask, &ptoken->privilege_mask ) ) { + DEBUG(0,("dup_nt_token: Failure to copy privilages!. " "Continuing with 0 privileges assigned.\n")); } @@ -108,8 +108,8 @@ NTSTATUS merge_nt_token(TALLOC_CTX *mem_ctx, } } - se_priv_add(&token->privileges, &token_1->privileges); - se_priv_add(&token->privileges, &token_2->privileges); + se_priv_add(&token->privilege_mask, &token_1->privilege_mask); + se_priv_add(&token->privilege_mask, &token_2->privilege_mask); *token_out = token; |