diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-31 22:39:25 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-02-17 09:01:47 +0100 |
| commit | da7b6f498b725f675bc9e7b4b4f0ba27e3d82941 (patch) | |
| tree | c77b0573d3530f6c9433eb85412ae8ebf396f184 | |
| parent | 279582536456ff49c08039873cfc43d1a350013d (diff) | |
| download | samba-da7b6f498b725f675bc9e7b4b4f0ba27e3d82941.tar.gz | |
s3-accessmask: re-run make samba3-idl and remove duplicate copies.
Guenther
(cherry picked from commit 1cbfcd7dcb90c117fa623246d6924e157ec5be3f)
| -rw-r--r-- | source/include/rpc_secdes.h | 15 | ||||
| -rw-r--r-- | source/librpc/gen_ndr/security.h | 6 |
2 files changed, 6 insertions, 15 deletions
diff --git a/source/include/rpc_secdes.h b/source/include/rpc_secdes.h index d2b2c2a2b20..5b5995eff24 100644 --- a/source/include/rpc_secdes.h +++ b/source/include/rpc_secdes.h @@ -146,21 +146,6 @@ struct standard_mapping { #define STD_RIGHT_ALL_ACCESS 0x001F0000 -/* Combinations of standard masks. */ -#define STANDARD_RIGHTS_ALL_ACCESS STD_RIGHT_ALL_ACCESS /* 0x001f0000 */ -#define STANDARD_RIGHTS_MODIFY_ACCESS STD_RIGHT_READ_CONTROL_ACCESS /* 0x00020000 */ -#define STANDARD_RIGHTS_EXECUTE_ACCESS STD_RIGHT_READ_CONTROL_ACCESS /* 0x00020000 */ -#define STANDARD_RIGHTS_READ_ACCESS STD_RIGHT_READ_CONTROL_ACCESS /* 0x00020000 */ -#define STANDARD_RIGHTS_WRITE_ACCESS \ - (STD_RIGHT_WRITE_OWNER_ACCESS | \ - STD_RIGHT_WRITE_DAC_ACCESS | \ - STD_RIGHT_DELETE_ACCESS) /* 0x000d0000 */ -#define STANDARD_RIGHTS_REQUIRED_ACCESS \ - (STD_RIGHT_DELETE_ACCESS | \ - STD_RIGHT_READ_CONTROL_ACCESS | \ - STD_RIGHT_WRITE_DAC_ACCESS | \ - STD_RIGHT_WRITE_OWNER_ACCESS) /* 0x000f0000 */ - /* File Object specific access rights */ #define SA_RIGHT_FILE_READ_DATA 0x00000001 diff --git a/source/librpc/gen_ndr/security.h b/source/librpc/gen_ndr/security.h index 7f3559a4cc6..32dd8d132d9 100644 --- a/source/librpc/gen_ndr/security.h +++ b/source/librpc/gen_ndr/security.h @@ -67,6 +67,12 @@ #define SEC_RIGHTS_DIR_WRITE ( SEC_RIGHTS_FILE_WRITE ) #define SEC_RIGHTS_DIR_EXECUTE ( SEC_RIGHTS_FILE_EXECUTE ) #define SEC_RIGHTS_DIR_ALL ( SEC_RIGHTS_FILE_ALL ) +#define STANDARD_RIGHTS_ALL_ACCESS ( SEC_STD_ALL ) +#define STANDARD_RIGHTS_MODIFY_ACCESS ( SEC_STD_READ_CONTROL ) +#define STANDARD_RIGHTS_EXECUTE_ACCESS ( SEC_STD_READ_CONTROL ) +#define STANDARD_RIGHTS_READ_ACCESS ( SEC_STD_READ_CONTROL ) +#define STANDARD_RIGHTS_WRITE_ACCESS ( (SEC_STD_WRITE_OWNER|SEC_STD_WRITE_DAC|SEC_STD_DELETE) ) +#define STANDARD_RIGHTS_REQUIRED_ACCESS ( (SEC_STD_DELETE|SEC_STD_READ_CONTROL|SEC_STD_WRITE_DAC|SEC_STD_WRITE_OWNER) ) #define SID_NULL ( "S-1-0-0" ) #define NAME_WORLD ( "WORLD" ) #define SID_WORLD_DOMAIN ( "S-1-1" ) |