From deb7c0243663d3fa435531bad77d2897b1d15285 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 17 Sep 2010 13:08:59 +1000 Subject: 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 --- source3/rpc_server/srv_samr_nt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/rpc_server/srv_samr_nt.c') 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; } -- cgit