diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:50:34 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:50:34 +0200 |
| commit | c17898db4e2e1ac342ce9dfb0991d58dbd6ea4af (patch) | |
| tree | d3bc06f9a617091b0300af4e1f85527391a1d1d9 /source3 | |
| parent | 81fabeff2dc51c043da19cd095175c4951f527b6 (diff) | |
| parent | f36ffa768129f01b0c12d30bff5e4e205dd3676c (diff) | |
| download | samba-c17898db4e2e1ac342ce9dfb0991d58dbd6ea4af.tar.gz samba-c17898db4e2e1ac342ce9dfb0991d58dbd6ea4af.tar.bz2 samba-c17898db4e2e1ac342ce9dfb0991d58dbd6ea4af.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/rpc_secdes.h | 70 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/svcctl.h | 8 |
2 files changed, 8 insertions, 70 deletions
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index 71fba41fe9..fb73498b0d 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -386,76 +386,6 @@ struct standard_mapping { 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 */ diff --git a/source3/librpc/gen_ndr/svcctl.h b/source3/librpc/gen_ndr/svcctl.h index 42ed039784..5da69794d2 100644 --- a/source3/librpc/gen_ndr/svcctl.h +++ b/source3/librpc/gen_ndr/svcctl.h @@ -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)] */ |