sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-05-27 17:05:51 +03:00
Code

s3-build: remove duplicate svcctl bits and re-run make samba3-idl.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2008-10-23 18:34:28 +02:00
parent c1e5f28456
commit f36ffa7681
2 changed files with 8 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
source3/include/rpc_secdes.h
View File

@ -385,76 +385,6 @@ struct standard_mapping {
(STANDARD_RIGHTS_EXECUTE_ACCESS | \
SA_RIGHT_ALIAS_LOOKUP_INFO ) /* 0x00020008 */
/*
* Acces bits for the svcctl objects
*/
/* Service Control Manager Bits */
#if 0
#define SC_RIGHT_MGR_CONNECT 0x0001
#define SC_RIGHT_MGR_CREATE_SERVICE 0x0002
#define SC_RIGHT_MGR_ENUMERATE_SERVICE 0x0004
#define SC_RIGHT_MGR_LOCK 0x0008
#define SC_RIGHT_MGR_QUERY_LOCK_STATUS 0x0010
#define SC_RIGHT_MGR_MODIFY_BOOT_CONFIG 0x0020
#endif
#define SC_MANAGER_READ_ACCESS \
( STANDARD_RIGHTS_READ_ACCESS | \
SC_RIGHT_MGR_CONNECT | \
SC_RIGHT_MGR_ENUMERATE_SERVICE | \
SC_RIGHT_MGR_QUERY_LOCK_STATUS )
#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 */
#if 0
#define SC_RIGHT_SVC_QUERY_CONFIG 0x0001
#define SC_RIGHT_SVC_CHANGE_CONFIG 0x0002
#define SC_RIGHT_SVC_QUERY_STATUS 0x0004
#define SC_RIGHT_SVC_ENUMERATE_DEPENDENTS 0x0008
#define SC_RIGHT_SVC_START 0x0010
#define SC_RIGHT_SVC_STOP 0x0020
#define SC_RIGHT_SVC_PAUSE_CONTINUE 0x0040
#define SC_RIGHT_SVC_INTERROGATE 0x0080
#define SC_RIGHT_SVC_USER_DEFINED_CONTROL 0x0100
#endif
#define SERVICE_READ_ACCESS \
( STANDARD_RIGHTS_READ_ACCESS | \
SC_RIGHT_SVC_ENUMERATE_DEPENDENTS | \
SC_RIGHT_SVC_INTERROGATE | \
SC_RIGHT_SVC_QUERY_CONFIG | \
SC_RIGHT_SVC_QUERY_STATUS | \
SC_RIGHT_SVC_USER_DEFINED_CONTROL )
#define SERVICE_EXECUTE_ACCESS \
( SERVICE_READ_ACCESS | \
SC_RIGHT_SVC_START | \
SC_RIGHT_SVC_STOP | \
SC_RIGHT_SVC_PAUSE_CONTINUE )
#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
/*
* Access Bits for registry ACLS
*/

8
source3/librpc/gen_ndr/svcctl.h
View File

@ -18,6 +18,14 @@
#define SERVICE_STATE_INACTIVE ( 0x02 )
#define SERVICE_STATE_ALL ( 0x03 )
#define SV_TYPE_ALL ( 0xFFFFFFFF )
#define SC_MANAGER_READ_ACCESS ( (STANDARD_RIGHTS_READ_ACCESS|SC_RIGHT_MGR_CONNECT|SC_RIGHT_MGR_ENUMERATE_SERVICE|SC_RIGHT_MGR_QUERY_LOCK_STATUS) )
#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 )
#define SERVICE_READ_ACCESS ( (STANDARD_RIGHTS_READ_ACCESS|SC_RIGHT_SVC_ENUMERATE_DEPENDENTS|SC_RIGHT_SVC_INTERROGATE|SC_RIGHT_SVC_QUERY_CONFIG|SC_RIGHT_SVC_QUERY_STATUS|SC_RIGHT_SVC_USER_DEFINED_CONTROL) )
#define SERVICE_EXECUTE_ACCESS ( (SERVICE_READ_ACCESS|SC_RIGHT_SVC_START|SC_RIGHT_SVC_STOP|SC_RIGHT_SVC_PAUSE_CONTINUE) )
#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 )
struct SERVICE_LOCK_STATUS {
uint32_t is_locked;
const char *lock_owner;/* [unique,charset(UTF16)] */