diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-08-30 13:04:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-11 18:46:09 +1000 |
| commit | 3bb77516b841def60e08e50bafc37517dd9d3ae0 (patch) | |
| tree | 6e2731a3ec26268648c42c09387c180b778f5cda /source3/rpc_server/srv_wkssvc_nt.c | |
| parent | b057867de3fbb423ef6afb9b7038ab99c83124d8 (diff) | |
| download | samba-3bb77516b841def60e08e50bafc37517dd9d3ae0.tar.gz samba-3bb77516b841def60e08e50bafc37517dd9d3ae0.tar.bz2 samba-3bb77516b841def60e08e50bafc37517dd9d3ae0.zip | |
s3-privs Convert from user_has_privileges() -> security_token_has_privilege()
This new call is available in the merged privileges code, and
takes an enum as the parameter, rather than a bitmask.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/rpc_server/srv_wkssvc_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_wkssvc_nt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_wkssvc_nt.c b/source3/rpc_server/srv_wkssvc_nt.c index 31513ed113..8c00254291 100644 --- a/source3/rpc_server/srv_wkssvc_nt.c +++ b/source3/rpc_server/srv_wkssvc_nt.c @@ -822,7 +822,7 @@ WERROR _wkssvc_NetrJoinDomain2(struct pipes_struct *p, return WERR_INVALID_PARAM; } - if (!user_has_privileges(token, &se_machine_account) && + if (!security_token_has_privilege(token, SEC_PRIV_MACHINE_ACCOUNT) && !nt_token_check_domain_rid(token, DOMAIN_RID_ADMINS) && !nt_token_check_sid(&global_sid_Builtin_Administrators, token)) { DEBUG(5,("_wkssvc_NetrJoinDomain2: account doesn't have " @@ -893,7 +893,7 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct pipes_struct *p, return WERR_INVALID_PARAM; } - if (!user_has_privileges(token, &se_machine_account) && + if (!security_token_has_privilege(token, SEC_PRIV_MACHINE_ACCOUNT) && !nt_token_check_domain_rid(token, DOMAIN_RID_ADMINS) && !nt_token_check_sid(&global_sid_Builtin_Administrators, token)) { DEBUG(5,("_wkssvc_NetrUnjoinDomain2: account doesn't have " |