diff options
| author | Jeremy Allison <jra@samba.org> | 2001-04-03 00:40:01 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-04-03 00:40:01 +0000 |
| commit | a6d201a8d7307f8a6342ee131917d6245ab41993 (patch) | |
| tree | 5262cee32c71cd1023fb1e0861352a645ca3fac5 /source3/include | |
| parent | 6c0c14a7425b76da349fbaf1defe3d4efa250764 (diff) | |
| download | samba-a6d201a8d7307f8a6342ee131917d6245ab41993.tar.gz samba-a6d201a8d7307f8a6342ee131917d6245ab41993.tar.bz2 samba-a6d201a8d7307f8a6342ee131917d6245ab41993.zip | |
Added XFS ACLs on Linux. Code from John Trostel <jtrostel@connex.com>.
Jeremy.
(This used to be commit 0865366f6b1070a8db3d8421c37c8072b36b96e3)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/config.h.in | 5 | ||||
| -rw-r--r-- | source3/include/includes.h | 4 | ||||
| -rw-r--r-- | source3/include/smb_acls.h | 42 |
3 files changed, 51 insertions, 0 deletions
diff --git a/source3/include/config.h.in b/source3/include/config.h.in index e60d5ca425..64714b1e91 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -203,6 +203,8 @@ #undef HAVE_POSIX_ACLS #undef HAVE_UNIXWARE_ACLS #undef HAVE_SOLARIS_ACLS +#undef HAVE_IRIX_ACLS +#undef HAVE_XFS_ACLS #undef HAVE_NO_ACLS /* The number of bytes in a int. */ @@ -715,6 +717,9 @@ /* Define if you have the yp_get_default_domain function. */ #undef HAVE_YP_GET_DEFAULT_DOMAIN +/* Define if you have the <acl/acl.h> header file. */ +#undef HAVE_ACL_ACL_H + /* Define if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H diff --git a/source3/include/includes.h b/source3/include/includes.h index 93c756a690..1c72220d4f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -271,6 +271,10 @@ #include <sys/acl.h> #endif +#ifdef HAVE_XFS_ACLS +#include <acl/acl.h> +#endif + #ifdef HAVE_SYS_FS_S5PARAM_H #include <sys/fs/s5param.h> #endif diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h index d7a9c53aaa..9de3a5b6a1 100644 --- a/source3/include/smb_acls.h +++ b/source3/include/smb_acls.h @@ -163,6 +163,48 @@ 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 */ + #else /* No ACLs. */ /* No ACLS - fake it. */ |