From 54abd2aa66069e6baf7769c496f46d9dba18db39 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 30 Sep 2005 17:13:37 +0000
Subject: r10656: BIG merge from trunk.  Features not copied over

* \PIPE\unixinfo
* winbindd's {group,alias}membership new functions
* winbindd's lookupsids() functionality
* swat (trunk changes to be reverted as per discussion with Deryck)
(This used to be commit 939c3cb5d78e3a2236209b296aa8aba8bdce32d3)
---
 source3/include/rpc_secdes.h | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'source3/include/rpc_secdes.h')

diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h
index b2b97e391e..c385e41fd3 100644
--- a/source3/include/rpc_secdes.h
+++ b/source3/include/rpc_secdes.h
@@ -481,13 +481,16 @@ typedef struct standard_mapping {
 	  SC_RIGHT_MGR_ENUMERATE_SERVICE	| \
 	  SC_RIGHT_MGR_QUERY_LOCK_STATUS )
 
-#define SC_MANAGER_ALL_ACCESS \
+#define SC_MANAGER_EXECUTE_ACCESS SC_MANAGER_READ_ACCESS
+
+#define SC_MANAGER_WRITE_ACCESS \
 	( STANDARD_RIGHTS_REQUIRED_ACCESS	| \
 	  SC_MANAGER_READ_ACCESS		| \
 	  SC_RIGHT_MGR_CREATE_SERVICE		| \
 	  SC_RIGHT_MGR_LOCK			| \
 	  SC_RIGHT_MGR_MODIFY_BOOT_CONFIG )
 
+#define SC_MANAGER_ALL_ACCESS SC_MANAGER_WRITE_ACCESS
 
 /* Service Object Bits */ 
 
@@ -515,12 +518,14 @@ typedef struct standard_mapping {
 	  SC_RIGHT_SVC_STOP			| \
 	  SC_RIGHT_SVC_PAUSE_CONTINUE )
 
-#define SERVICE_ALL_ACCESS \
+#define SERVICE_WRITE_ACCESS \
 	( STANDARD_RIGHTS_REQUIRED_ACCESS	| \
 	  SERVICE_READ_ACCESS			| \
 	  SERVICE_EXECUTE_ACCESS		| \
 	  SC_RIGHT_SVC_CHANGE_CONFIG )
 
+#define SERVICE_ALL_ACCESS SERVICE_WRITE_ACCESS
+
 	   
 
 /*
-- 
cgit