diff options
| author | Günther Deschner <gd@samba.org> | 2010-06-02 23:48:15 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-06-03 11:00:25 +0200 |
| commit | 37b978c343b5727c7257d7a0a574ba82bb0c9c0f (patch) | |
| tree | f0f03264a264679fd9618b7875356b703c443ea9 | |
| parent | 2794d2ee7f8e088060e4b86532176673cf7c2580 (diff) | |
| download | samba-37b978c343b5727c7257d7a0a574ba82bb0c9c0f.tar.gz samba-37b978c343b5727c7257d7a0a574ba82bb0c9c0f.tar.bz2 samba-37b978c343b5727c7257d7a0a574ba82bb0c9c0f.zip | |
s3-security: use shared "Generic access rights".
Guenther
| -rw-r--r-- | source3/include/rpc_secdes.h | 7 | ||||
| -rw-r--r-- | source3/modules/vfs_afsacl.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source3/include/rpc_secdes.h b/source3/include/rpc_secdes.h index ec1bbc61ea..f3efe27d7f 100644 --- a/source3/include/rpc_secdes.h +++ b/source3/include/rpc_secdes.h @@ -41,13 +41,6 @@ struct standard_mapping { uint32 std_all; }; -/* Generic access rights */ - -#define GENERIC_RIGHT_ALL_ACCESS 0x10000000 -#define GENERIC_RIGHT_EXECUTE_ACCESS 0x20000000 -#define GENERIC_RIGHT_WRITE_ACCESS 0x40000000 -#define GENERIC_RIGHT_READ_ACCESS 0x80000000 - /* Standard access rights. */ #define STD_RIGHT_DELETE_ACCESS 0x00010000 diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index dacd58f7ae..9dd5df87ec 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -514,7 +514,7 @@ static struct static_dir_ace_mapping { /* FULL inherit only -- counterpart to previous one */ { 0, SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY, - PERMS_FULL | GENERIC_RIGHT_WRITE_ACCESS, 127 /* rlidwka */ }, + PERMS_FULL | SEC_GENERIC_WRITE, 127 /* rlidwka */ }, /* CHANGE without inheritance -- in all cases here we also get the corresponding INHERIT_ONLY ACE in the same ACL */ @@ -522,7 +522,7 @@ static struct static_dir_ace_mapping { /* CHANGE inherit only -- counterpart to previous one */ { 0, SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT|SEC_ACE_FLAG_INHERIT_ONLY, - PERMS_CHANGE | GENERIC_RIGHT_WRITE_ACCESS, 63 /* rlidwk */ }, + PERMS_CHANGE | SEC_GENERIC_WRITE, 63 /* rlidwk */ }, /* End marker, hopefully there's no afs right 9999 :-) */ { 0, 0, 0, 9999 } |