diff options
| author | Jeremy Allison <jra@samba.org> | 2010-10-22 15:58:40 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-10-22 23:41:36 +0000 |
| commit | 272feb7bd133344e88864ffc75d251451ddd681c (patch) | |
| tree | afde6cf4f229d0e2611af14be1210d9b33b2a31a /source3/rpc_server/srv_wkssvc_nt.c | |
| parent | d46ca0eb801f2664cedb17c50a9a94e58ebdb0b6 (diff) | |
| download | samba-272feb7bd133344e88864ffc75d251451ddd681c.tar.gz samba-272feb7bd133344e88864ffc75d251451ddd681c.tar.bz2 samba-272feb7bd133344e88864ffc75d251451ddd681c.zip | |
Revert "Wrap security_token_has_privilege() with a check for lp_enable_privileges(). Needed"
Not needed - privileges code prevents "enable privileges = no" from adding privileges
anyway.
This reverts commit a8b95686a7bde3f96f141b6938e24e101567ef54.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Oct 22 23:41:36 UTC 2010 on sn-devel-104
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 aa30d14fac..000b605913 100644 --- a/source3/rpc_server/srv_wkssvc_nt.c +++ b/source3/rpc_server/srv_wkssvc_nt.c @@ -823,7 +823,7 @@ WERROR _wkssvc_NetrJoinDomain2(struct pipes_struct *p, return WERR_INVALID_PARAM; } - if (!s3_security_token_has_privilege(token, SEC_PRIV_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 " @@ -894,7 +894,7 @@ WERROR _wkssvc_NetrUnjoinDomain2(struct pipes_struct *p, return WERR_INVALID_PARAM; } - if (!s3_security_token_has_privilege(token, SEC_PRIV_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 " |