summaryrefslogtreecommitdiff
path: root/source3/rpc_server/srv_svcctl_nt.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-11-01 00:34:39 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-11-01 00:34:39 +0100
commit72a1e3acfa5789134a28fb0609bc88b25c0e0b15 (patch)
treee7a7e8aaddbae9a97543d5b13bc16ce2e154c134 /source3/rpc_server/srv_svcctl_nt.c
parent59206674521065e041a6020f9ba793fac47b1d7d (diff)
parentff274e57eacb9ac4c81adfcfea4f7b4b668a7d94 (diff)
downloadsamba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.tar.gz
samba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.tar.bz2
samba-72a1e3acfa5789134a28fb0609bc88b25c0e0b15.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/rpc_server/srv_svcctl_nt.c')
-rw-r--r--source3/rpc_server/srv_svcctl_nt.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_svcctl_nt.c b/source3/rpc_server/srv_svcctl_nt.c
index a7215ac686..cb6657400f 100644
--- a/source3/rpc_server/srv_svcctl_nt.c
+++ b/source3/rpc_server/srv_svcctl_nt.c
@@ -123,16 +123,12 @@ static struct service_control_op* find_service_by_name( const char *name )
static NTSTATUS svcctl_access_check( SEC_DESC *sec_desc, NT_USER_TOKEN *token,
uint32 access_desired, uint32 *access_granted )
{
- NTSTATUS result;
-
if ( geteuid() == sec_initial_uid() ) {
DEBUG(5,("svcctl_access_check: using root's token\n"));
token = get_root_nt_token();
}
- se_access_check( sec_desc, token, access_desired, access_granted, &result );
-
- return result;
+ return se_access_check( sec_desc, token, access_desired, access_granted);
}
/********************************************************************