From 08138a32446404e64c6738c8f3653c727d113c03 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 26 Jul 2001 21:16:39 +0000 Subject: Fix from Michael Davidson for DEC OSF/1 ACLs (ie. Digital UNIX). Jeremy. (This used to be commit 324ba0512ec84bb173c72be3dfd2447e0dc30e26) --- source3/include/config.h.in | 3 ++- source3/include/smb_acls.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) (limited to 'source3/include') diff --git a/source3/include/config.h.in b/source3/include/config.h.in index 7bf9923368..8e1af4c8f3 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -1,4 +1,4 @@ -/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* include/config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if on AIX 3. System headers sometimes define this. @@ -210,6 +210,7 @@ #undef HAVE_SOLARIS_ACLS #undef HAVE_IRIX_ACLS #undef HAVE_AIX_ACLS +#undef HAVE_DRAFT13_POSIX_ACLS #undef HAVE_NO_ACLS #undef HAVE_LIBPAM #undef HAVE_ASPRINTF_DECL diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h index bea90bf46a..4b282481ff 100644 --- a/source3/include/smb_acls.h +++ b/source3/include/smb_acls.h @@ -54,6 +54,36 @@ #define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS #define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT +#elif defined(HAVE_DRAFT13_POSIX_ACLS) + +/* This is for DEC OSF/1 */ + +#define SMB_ACL_TAG_T acl_tag_t +#define SMB_ACL_TYPE_T acl_type_t +#define SMB_ACL_PERMSET_T 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 +#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 0 +#define SMB_ACL_NEXT_ENTRY 1 + +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_ACCESS +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT + #elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS) /* * Donated by Michael Davidson for UnixWare / OpenUNIX. -- cgit