diff options
author | Jeremy Allison <jra@samba.org> | 2001-06-18 20:27:35 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2001-06-18 20:27:35 +0000 |
commit | 809c0258780cc75cd456518571891fc30998d30d (patch) | |
tree | 17cc3a7ce2e01eecbd807388637cc2f1d02977e5 /source3/include/smb_acls.h | |
parent | 0417200fa9af35167de3e4d6df7c3071f07b15a9 (diff) | |
download | samba-809c0258780cc75cd456518571891fc30998d30d.tar.gz samba-809c0258780cc75cd456518571891fc30998d30d.tar.bz2 samba-809c0258780cc75cd456518571891fc30998d30d.zip |
Added patches to remove Linux specific XFS ACLs. These are now handled by the
generic Linux ACL code.
rpc_server/srv_samr_nt.c: Don't delete a policy handle before it's created.
Jeremy.
(This used to be commit db5b82e53a7061c4764d39ceb3df82e706aad42f)
Diffstat (limited to 'source3/include/smb_acls.h')
-rw-r--r-- | source3/include/smb_acls.h | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h index 613f6db3e3..bea90bf46a 100644 --- a/source3/include/smb_acls.h +++ b/source3/include/smb_acls.h @@ -124,48 +124,6 @@ typedef struct SMB_ACL_T { #define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS #define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT -/* XFS ACLS are defined here */ -/* donated by John Trostel (jtrostel@connex.com) */ - -#elif defined(HAVE_XFS_ACLS) - -/* This is an nearly an identity mapping (just remove the SMB_). */ -#define SMB_ACL_TAG_T acl_tag_t -#define SMB_ACL_TYPE_T acl_type_t -//#define SMB_ACL_PERMSET_T acl_permset_t -typedef ushort *SMB_ACL_PERMSET_T; -#define SMB_ACL_PERM_T acl_perm_t -#define SMB_ACL_READ ACL_READ -#define SMB_ACL_WRITE ACL_WRITE -#define SMB_ACL_EXECUTE ACL_EXECUTE - -/* Types of ACLs. */ -#define SMB_ACL_USER ACL_USER -#define SMB_ACL_USER_OBJ ACL_USER_OBJ -#define SMB_ACL_GROUP ACL_GROUP -#define SMB_ACL_GROUP_OBJ ACL_GROUP_OBJ -#define SMB_ACL_OTHER ACL_OTHER_OBJ -#define SMB_ACL_MASK ACL_MASK - -#define SMB_ACL_T acl_t - -#define SMB_ACL_ENTRY_T acl_entry_t - -#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY -#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY - -#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS -#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT - -/* Not yet in Official SGI XFS CVS */ - -#if defined(CONFIG_EXTENDED_PERMISSSION) -#define SMB_ACL_CHOWN ACL_CHOWN -#define SMB_ACL_CHMOD ACL_CHMOD -#define SMB_ACL_DELETE ACL_DELETE -#define EXTENDED_PERM_BITS (ACL_CHOWN|ACL_CHMOD|ACL_DELETE) -#endif /* CONFIG_EXTENDED_PERMISSION */ - #elif defined(HAVE_AIX_ACLS) /* Donated by Medha Date, mdate@austin.ibm.com, for IBM */ |