diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 20:42:30 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 20:42:30 +0200 |
| commit | 7577d9ebf06fcdb630b2cdaab8772a6da9e37b70 (patch) | |
| tree | 8279953b1d7f24647ef8bb728881938f6f875400 /source3 | |
| parent | fe36fe8c3e76e3dd7c66ecdf7254dc01c5d065c0 (diff) | |
| parent | 27c4cf4e7b2ba042b4caace7bab19f9e37510d86 (diff) | |
| download | samba-7577d9ebf06fcdb630b2cdaab8772a6da9e37b70.tar.gz samba-7577d9ebf06fcdb630b2cdaab8772a6da9e37b70.tar.bz2 samba-7577d9ebf06fcdb630b2cdaab8772a6da9e37b70.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/librpc/gen_ndr/ndr_svcctl.c | 1 | ||||
| -rw-r--r-- | source3/librpc/gen_ndr/svcctl.h | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/librpc/gen_ndr/ndr_svcctl.c b/source3/librpc/gen_ndr/ndr_svcctl.c index e897ef334b..d04c89b9a1 100644 --- a/source3/librpc/gen_ndr/ndr_svcctl.c +++ b/source3/librpc/gen_ndr/ndr_svcctl.c @@ -4,6 +4,7 @@ #include "librpc/gen_ndr/ndr_svcctl.h" #include "librpc/gen_ndr/ndr_misc.h" +#include "librpc/gen_ndr/ndr_security.h" static enum ndr_err_code ndr_push_SERVICE_LOCK_STATUS(struct ndr_push *ndr, int ndr_flags, const struct SERVICE_LOCK_STATUS *r) { if (ndr_flags & NDR_SCALARS) { diff --git a/source3/librpc/gen_ndr/svcctl.h b/source3/librpc/gen_ndr/svcctl.h index 5da69794d2..b098eb1c42 100644 --- a/source3/librpc/gen_ndr/svcctl.h +++ b/source3/librpc/gen_ndr/svcctl.h @@ -3,6 +3,7 @@ #include <stdint.h> #include "librpc/gen_ndr/misc.h" +#include "librpc/gen_ndr/security.h" #ifndef _HEADER_svcctl #define _HEADER_svcctl @@ -18,13 +19,13 @@ #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_READ_ACCESS ( (SEC_STD_READ_CONTROL|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_WRITE_ACCESS ( (SEC_STD_REQUIRED|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_READ_ACCESS ( (SEC_STD_READ_CONTROL|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_WRITE_ACCESS ( (SEC_STD_REQUIRED|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; |