diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 20:50:59 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 20:50:59 +0200 |
commit | 215b84903ed202e69241d9fd9494fdc95e911efc (patch) | |
tree | adb66c63498eb1c3e2e165684a123207c9d5c5d3 /source3/librpc | |
parent | 09065795d6e5c48a8b3b536224552f18d68cfb84 (diff) | |
parent | 7577d9ebf06fcdb630b2cdaab8772a6da9e37b70 (diff) | |
download | samba-215b84903ed202e69241d9fd9494fdc95e911efc.tar.gz samba-215b84903ed202e69241d9fd9494fdc95e911efc.tar.bz2 samba-215b84903ed202e69241d9fd9494fdc95e911efc.zip |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source3/librpc')
-rw-r--r-- | source3/librpc/gen_ndr/ndr_svcctl.c | 1 | ||||
-rw-r--r-- | source3/librpc/gen_ndr/svcctl.h | 9 |
2 files changed, 10 insertions, 0 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 42ed039784..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,6 +19,14 @@ #define SERVICE_STATE_INACTIVE ( 0x02 ) #define SERVICE_STATE_ALL ( 0x03 ) #define SV_TYPE_ALL ( 0xFFFFFFFF ) +#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 ( (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 ( (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 ( (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; const char *lock_owner;/* [unique,charset(UTF16)] */ |