svn commit: samba r10585 - in branches/SAMBA_3_0/source/rpc_server: .

[jerry at samba.org]

Author: jerry
Date: 2005-09-28 16:54:42 +0000 (Wed, 28 Sep 2005)
New Revision: 10585

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10585

Log:
variation of fix in trunk for root-free-pass in registry access checks
Modified:
   branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c


Changeset:
Modified: branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c
===================================================================
--- branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c	2005-09-28 16:53:17 UTC (rev 10584)
+++ branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c	2005-09-28 16:54:42 UTC (rev 10585)
@@ -44,14 +44,13 @@
 {
 	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;