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

[jerry at samba.org]

Author: jerry
Date: 2005-06-28 22:39:18 +0000 (Tue, 28 Jun 2005)
New Revision: 7987

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

Log:
map generic bits to specific bits in open requests
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-06-28 22:13:53 UTC (rev 7986)
+++ branches/SAMBA_3_0/source/rpc_server/srv_reg_nt.c	2005-06-28 22:39:18 UTC (rev 7987)
@@ -41,7 +41,7 @@
 
 /* no idea if this is correct, just use the file access bits for now */
 
-struct generic_mapping reg_map = { REG_KEY_READ, REG_KEY_WRITE, REG_KEY_EXECUTE, REG_KEY_ALL };
+static struct generic_mapping reg_generic_map = { REG_KEY_READ, REG_KEY_WRITE, REG_KEY_EXECUTE, REG_KEY_ALL };
 
 /********************************************************************
 ********************************************************************/
@@ -51,6 +51,7 @@
 {
 	NTSTATUS result;
 		
+	se_map_generic( &access_desired, &reg_generic_map );
 	se_access_check( sec_desc, token, access_desired, access_granted, &result );
 	
 	return result;
@@ -1020,12 +1021,12 @@
 
 	/* basic access for Everyone */
 
-	init_sec_access(&mask, reg_map.generic_execute | reg_map.generic_read );
+	init_sec_access(&mask, reg_generic_map.generic_execute | reg_generic_map.generic_read );
 	init_sec_ace(&ace[0], &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);
 
 	/* add Full Access 'BUILTIN\Administrators' */
 
-	init_sec_access(&mask, reg_map.generic_all);
+	init_sec_access(&mask, reg_generic_map.generic_all);
 	sid_copy(&adm_sid, &global_sid_Builtin);
 	sid_append_rid(&adm_sid, BUILTIN_ALIAS_RID_ADMINS);
 	init_sec_ace(&ace[1], &adm_sid, SEC_ACE_TYPE_ACCESS_ALLOWED, mask, 0);