diff options
author | Andrew Bartlett <abartlet@samba.org> | 2010-09-17 13:08:59 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2010-10-14 02:35:04 +0000 |
commit | deb7c0243663d3fa435531bad77d2897b1d15285 (patch) | |
tree | 61a4500d22c3641aa161dfa4dd053c1527503a7c /source3/rpc_server | |
parent | c41bb6e846b61b92295887fcbfa670e3f5fbbb46 (diff) | |
download | samba-deb7c0243663d3fa435531bad77d2897b1d15285.tar.gz samba-deb7c0243663d3fa435531bad77d2897b1d15285.tar.bz2 samba-deb7c0243663d3fa435531bad77d2897b1d15285.zip |
s3 Replace is_sid_in_token() with security_token_has_sid() from common code
The two routines are identical, so there is no need to keep both.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/rpc_server')
-rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 874a9214f2..a04584e7c1 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -269,8 +269,8 @@ void map_max_allowed_access(const struct security_token *nt_token, /* Full Access for 'BUILTIN\Administrators' and 'BUILTIN\Account Operators */ - if (is_sid_in_token(nt_token, &global_sid_Builtin_Administrators) || - is_sid_in_token(nt_token, &global_sid_Builtin_Account_Operators)) { + if (security_token_has_sid(nt_token, &global_sid_Builtin_Administrators) || + security_token_has_sid(nt_token, &global_sid_Builtin_Account_Operators)) { *pacc_requested |= GENERIC_ALL_ACCESS; return; } @@ -280,7 +280,7 @@ void map_max_allowed_access(const struct security_token *nt_token, struct dom_sid domadmin_sid; sid_compose(&domadmin_sid, get_global_sam_sid(), DOMAIN_RID_ADMINS); - if (is_sid_in_token(nt_token, &domadmin_sid)) { + if (security_token_has_sid(nt_token, &domadmin_sid)) { *pacc_requested |= GENERIC_ALL_ACCESS; return; } |