X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4fd842f98df4970f6e49a0365dbed60774e56c09..d3d07a5e860f1cde0e234ec7a1aff7111a2c514f:/lib/sysacls.h diff --git a/lib/sysacls.h b/lib/sysacls.h index b8b7f117..fd75bb60 100644 --- a/lib/sysacls.h +++ b/lib/sysacls.h @@ -3,10 +3,12 @@ * Version 2.2.x * Portable SMB ACL interface * Copyright (C) Jeremy Allison 2000 + * Copyright (C) 2007-2008 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -32,13 +34,12 @@ #define SMB_REALLOC(mem, cnt) realloc_array(mem, char, cnt) #define slprintf snprintf -#if defined HAVE_POSIX_ACLS +#if defined HAVE_POSIX_ACLS /*-----------------------------------------------*/ /* This is 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 /* Types of ACLs. */ #define SMB_ACL_USER ACL_USER @@ -63,13 +64,12 @@ #define SMB_ACL_NEED_SORT -#elif defined HAVE_TRU64_ACLS +#elif defined HAVE_TRU64_ACLS /*---------------------------------------------*/ /* This is for DEC/Compaq Tru64 UNIX */ #define SMB_ACL_TAG_T acl_tag_t #define SMB_ACL_TYPE_T acl_type_t -#define SMB_ACL_PERMSET_T acl_permset_t /* Types of ACLs. */ #define SMB_ACL_USER ACL_USER @@ -94,7 +94,7 @@ #define SMB_ACL_NEED_SORT -#elif defined HAVE_UNIXWARE_ACLS || defined HAVE_SOLARIS_ACLS +#elif defined HAVE_UNIXWARE_ACLS || defined HAVE_SOLARIS_ACLS /*-------------*/ /* Donated by Michael Davidson for UnixWare / OpenUNIX. * Modified by Toomas Soome for Solaris. */ @@ -102,7 +102,6 @@ /* SVR4.2 ES/MP ACLs */ typedef int SMB_ACL_TAG_T; typedef int SMB_ACL_TYPE_T; -typedef ushort *SMB_ACL_PERMSET_T; /* Types of ACLs. */ #define SMB_ACL_USER USER @@ -136,7 +135,7 @@ typedef struct acl *SMB_ACL_ENTRY_T; #define SMB_ACL_LOSES_SPECIAL_MODE_BITS #endif -#elif defined HAVE_HPUX_ACLS +#elif defined HAVE_HPUX_ACLS /*----------------------------------------------*/ /* Based on the Solaris & UnixWare code. */ @@ -146,7 +145,6 @@ typedef struct acl *SMB_ACL_ENTRY_T; /* SVR4.2 ES/MP ACLs */ typedef int SMB_ACL_TAG_T; typedef int SMB_ACL_TYPE_T; -typedef ushort *SMB_ACL_PERMSET_T; /* Types of ACLs. */ #define SMB_ACL_USER USER @@ -176,13 +174,12 @@ typedef struct acl *SMB_ACL_ENTRY_T; #define SMB_ACL_NEED_SORT -#elif defined HAVE_IRIX_ACLS +#elif defined HAVE_IRIX_ACLS /*----------------------------------------------*/ /* IRIX ACLs */ #define SMB_ACL_TAG_T acl_tag_t #define SMB_ACL_TYPE_T acl_type_t -#define SMB_ACL_PERMSET_T acl_permset_t /* Types of ACLs. */ #define SMB_ACL_USER ACL_USER @@ -211,14 +208,12 @@ typedef struct SMB_ACL_T { #define SMB_ACL_NEED_SORT -#elif defined HAVE_AIX_ACLS +#elif defined HAVE_AIX_ACLS /*-----------------------------------------------*/ /* Donated by Medha Date, mdate@austin.ibm.com, for IBM */ #include "/usr/include/acl.h" -typedef uint *SMB_ACL_PERMSET_T; - struct acl_entry_link{ struct acl_entry_link *prevp; struct new_acl_entry *entryp; @@ -247,7 +242,6 @@ struct new_acl_entry{ #define SMB_ACL_OTHER 5 #define SMB_ACL_MASK 6 - #define SMB_ACL_FIRST_ENTRY 1 #define SMB_ACL_NEXT_ENTRY 2 @@ -259,7 +253,32 @@ struct new_acl_entry{ #define SMB_ACL_NEED_SORT -#else +#elif defined(HAVE_OSX_ACLS) /*----------------------------------------------*/ + +/* Special handling for OS X ACLs */ + +#define SMB_ACL_TAG_T acl_tag_t +#define SMB_ACL_TYPE_T acl_type_t + +#define SMB_ACL_T acl_t + +#define SMB_ACL_ENTRY_T acl_entry_t + +#define SMB_ACL_USER 1 +#define SMB_ACL_GROUP 2 + +#define SMB_ACL_FIRST_ENTRY ACL_FIRST_ENTRY +#define SMB_ACL_NEXT_ENTRY ACL_NEXT_ENTRY + +#define SMB_ACL_TYPE_ACCESS ACL_TYPE_EXTENDED +#define SMB_ACL_TYPE_DEFAULT ACL_TYPE_DEFAULT + +#define SMB_ACL_VALID_NAME_BITS ((1<<25)-1) +#define SMB_ACL_VALID_OBJ_BITS 0 + +/*#undef SMB_ACL_NEED_SORT*/ + +#else /*---------------------------------------------------------------------*/ /* Unknown platform. */ @@ -269,21 +288,18 @@ struct new_acl_entry{ int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p); int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p); -int sys_acl_get_access_bits(SMB_ACL_ENTRY_T entry_d, uint32 *bits); -void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d); +int sys_acl_get_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T *tag_type_p, uint32 *bits_p, id_t *u_g_id_p); SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type); SMB_ACL_T sys_acl_get_fd(int fd); SMB_ACL_T sys_acl_init(int count); int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry); -int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype); -int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry, void *qual); +int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype, uint32 bits, id_t u_g_id); int sys_acl_set_access_bits(SMB_ACL_ENTRY_T entry, uint32 bits); int sys_acl_valid(SMB_ACL_T theacl); int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl); int sys_acl_set_fd(int fd, SMB_ACL_T theacl); int sys_acl_delete_def_file(const char *name); int sys_acl_free_acl(SMB_ACL_T the_acl); -int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype); int no_acl_syscall_error(int err); #endif /* SUPPORT_ACLS */