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_winreg_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_winreg_nt.c')
| -rw-r--r-- | source3/rpc_server/srv_winreg_nt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index 44cdfcbb37..298f33ab70 100644 --- a/source3/rpc_server/srv_winreg_nt.c +++ b/source3/rpc_server/srv_winreg_nt.c @@ -577,7 +577,7 @@ WERROR _winreg_InitiateSystemShutdownEx(struct pipes_struct *p, return WERR_NOMEM; } - can_shutdown = s3_security_token_has_privilege(p->server_info->ptok, SEC_PRIV_REMOTE_SHUTDOWN); + can_shutdown = security_token_has_privilege(p->server_info->ptok, SEC_PRIV_REMOTE_SHUTDOWN); /* IF someone has privs, run the shutdown script as root. OTHERWISE run it as not root Take the error return from the script and provide it as the Windows return code. */ @@ -614,7 +614,7 @@ WERROR _winreg_AbortSystemShutdown(struct pipes_struct *p, if (!*abort_shutdown_script) return WERR_ACCESS_DENIED; - can_shutdown = s3_security_token_has_privilege(p->server_info->ptok, SEC_PRIV_REMOTE_SHUTDOWN); + can_shutdown = security_token_has_privilege(p->server_info->ptok, SEC_PRIV_REMOTE_SHUTDOWN); /********** BEGIN SeRemoteShutdownPrivilege BLOCK **********/ @@ -704,7 +704,7 @@ WERROR _winreg_RestoreKey(struct pipes_struct *p, /* user must posses SeRestorePrivilege for this this proceed */ - if ( !s3_security_token_has_privilege(p->server_info->ptok, SEC_PRIV_RESTORE)) { + if ( !security_token_has_privilege(p->server_info->ptok, SEC_PRIV_RESTORE)) { return WERR_ACCESS_DENIED; } |