summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-09-28 16:54:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:04:47 -0500
commit1896d77fe59de96e3ccc33c35fc93317d907b697 (patch)
tree5367f1ae8e41789066777ba10956aa067459521b
parent22f603ac567f369b544267c5e891d282dd3e2dfa (diff)
downloadsamba-1896d77fe59de96e3ccc33c35fc93317d907b697.tar.gz
samba-1896d77fe59de96e3ccc33c35fc93317d907b697.tar.bz2
samba-1896d77fe59de96e3ccc33c35fc93317d907b697.zip
r10585: variation of fix in trunk for root-free-pass in registry access checks
(This used to be commit b41f997a2a67f7dc60b300866b38f72846c600fb)
-rw-r--r--source3/rpc_server/srv_reg_nt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/rpc_server/srv_reg_nt.c b/source3/rpc_server/srv_reg_nt.c
index 9ffc77fce8..a405948864 100644
--- a/source3/rpc_server/srv_reg_nt.c
+++ b/source3/rpc_server/srv_reg_nt.c
@@ -44,14 +44,13 @@ NTSTATUS registry_access_check( SEC_DESC *sec_desc, NT_USER_TOKEN *token,
{
NTSTATUS result;
- se_map_generic( &access_desired, &reg_generic_map );
-
if ( geteuid() == sec_initial_uid() ) {
DEBUG(5,("registry_access_check: access check bypassed for 'root'\n"));
- *access_granted = access_desired;
+ *access_granted = REG_KEY_ALL;
return NT_STATUS_OK;
}
+ se_map_generic( &access_desired, &reg_generic_map );
se_access_check( sec_desc, token, access_desired, access_granted, &result );
return result;