r10585: variation of fix in trunk for root-free-pass in registry access checks

(This used to be commit b41f997a2a67f7dc60b300866b38f72846c600fb)

diff --git a/source3/rpc_server/srv_reg_nt.c b/source3/rpc_server/srv_reg_nt.c
index 9ffc77fce80631eb43d7508296742927fda2d119..a405948864b8eae8b1794d1fbd4798ef0e069332 100644 (file)
--- 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;