X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4fd842f98df4970f6e49a0365dbed60774e56c09..85b057cccff3e3df925e481f889ff4678a594c19:/lib/sysacls.c

diff --git a/lib/sysacls.c b/lib/sysacls.c
index 699a1659..26ae86b0 100644
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
@@ -7,8 +7,9 @@
  * one call.  Some functions that rsync doesn't need were also removed.
  *
  * 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
@@ -44,34 +45,22 @@ void SAFE_FREE(void *mem)
 
  int sys_acl_get_entry( SMB_ACL_T theacl, 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 tag_type, 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 *path)
-
- The generic POSIX free is the following call. We split this into
- several different free functions as we may need to add tag info
- to structures when emulating the POSIX interface.
-
- int sys_acl_free( void *obj_p)
-
- The calls we actually use are :
-
  int sys_acl_free_acl(SMB_ACL_T posix_acl)
- int sys_acl_free_qualifier(void *qualifier, SMB_ACL_TAG_T tagtype)
 
 */
 
-#if defined(HAVE_POSIX_ACLS)
+#if defined(HAVE_POSIX_ACLS) /*--------------------------------------------*/
 
 /* Identity mapping - easy. */
 
@@ -85,11 +74,6 @@ int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
 	return acl_get_tag_type( entry_d, tag_type_p);
 }
 
-void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
-{
-	return acl_get_qualifier( entry_d);
-}
-
 SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 {
 	return acl_get_file( path_p, type);
@@ -106,15 +90,26 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 #define acl_get_perm(p, b) acl_get_perm_np(p, b)
 #endif
 
-int sys_acl_get_access_bits(SMB_ACL_ENTRY_T entry_d, uint32 *bits)
+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_PERMSET_T permset;
-	int rc;
-	if ((rc = acl_get_permset(entry_d, &permset)) != 0)
-		return rc;
-	*bits = (acl_get_perm(permset, ACL_READ) ? 4 : 0)
-	      | (acl_get_perm(permset, ACL_WRITE) ? 2 : 0)
-	      | (acl_get_perm(permset, ACL_EXECUTE) ? 1 : 0);
+	acl_permset_t permset;
+
+	if (acl_get_tag_type(entry, tag_type_p) != 0
+	 || acl_get_permset(entry, &permset) != 0)
+		return -1;
+
+	*bits_p = (acl_get_perm(permset, ACL_READ) ? 4 : 0)
+		| (acl_get_perm(permset, ACL_WRITE) ? 2 : 0)
+		| (acl_get_perm(permset, ACL_EXECUTE) ? 1 : 0);
+
+	if (*tag_type_p == SMB_ACL_USER || *tag_type_p == SMB_ACL_GROUP) {
+		void *qual;
+		if ((qual = acl_get_qualifier(entry)) == NULL)
+			return -1;
+		*u_g_id_p = *(id_t*)qual;
+		acl_free(qual);
+	}
+
 	return 0;
 }
 
@@ -128,19 +123,22 @@ int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
 	return acl_create_entry(pacl, pentry);
 }
 
-int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
+int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits, id_t u_g_id)
 {
-	return acl_set_tag_type(entry, tagtype);
-}
+	if (acl_set_tag_type(entry, tag_type) != 0)
+		return -1;
 
-int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
-{
-	return acl_set_qualifier(entry, qual);
+	if (tag_type == SMB_ACL_USER || tag_type == SMB_ACL_GROUP) {
+		if (acl_set_qualifier(entry, (void*)&u_g_id) != 0)
+			return -1;
+	}
+
+	return sys_acl_set_access_bits(entry, bits);
 }
 
 int sys_acl_set_access_bits(SMB_ACL_ENTRY_T entry, uint32 bits)
 {
-	SMB_ACL_PERMSET_T permset;
+	acl_permset_t permset;
 	int rc;
 	if ((rc = acl_get_permset(entry, &permset)) != 0)
 		return rc;
@@ -164,10 +162,12 @@ int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
 	return acl_set_file(name, acltype, theacl);
 }
 
+#if 0
 int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
 {
 	return acl_set_fd(fd, theacl);
 }
+#endif
 
 int sys_acl_delete_def_file(const char *name)
 {
@@ -179,12 +179,7 @@ int sys_acl_free_acl(SMB_ACL_T the_acl)
 	return acl_free(the_acl);
 }
 
-int sys_acl_free_qualifier(void *qual, UNUSED(SMB_ACL_TAG_T tagtype))
-{
-	return acl_free(qual);
-}
-
-#elif defined(HAVE_TRU64_ACLS)
+#elif defined(HAVE_TRU64_ACLS) /*--------------------------------------------*/
 /*
  * The interface to DEC/Compaq Tru64 UNIX ACLs
  * is based on Draft 13 of the POSIX spec which is
@@ -217,11 +212,6 @@ int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
 	return acl_get_tag_type( entry_d, tag_type_p);
 }
 
-void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
-{
-	return acl_get_qualifier( entry_d);
-}
-
 SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 {
 	return acl_get_file((char *)path_p, type);
@@ -234,13 +224,24 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 }
 #endif
 
-int sys_acl_get_access_bits(SMB_ACL_ENTRY_T entry_d, uint32 *bits)
+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_PERMSET_T permset;
-	int rc;
-	if ((rc = acl_get_permset(entry_d, &permset)) != 0)
-		return rc;
-	*bits = *permset & 7;	/* Tru64 doesn't have acl_get_perm() */
+	acl_permset_t permset;
+
+	if (acl_get_tag_type(entry, tag_type_p) != 0
+	 || acl_get_permset(entry, &permset) != 0)
+		return -1;
+
+	*bits_p = *permset & 7;	/* Tru64 doesn't have acl_get_perm() */
+
+	if (*tag_type_p == SMB_ACL_USER || *tag_type_p == SMB_ACL_GROUP) {
+		void *qual;
+		if ((qual = acl_get_qualifier(entry)) == NULL)
+			return -1;
+		*u_g_id_p = *(id_t*)qual;
+		acl_free_qualifier(qual, *tag_type_p);
+	}
+
 	return 0;
 }
 
@@ -261,19 +262,22 @@ int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
 	return 0;
 }
 
-int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
+int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits, id_t u_g_id)
 {
-	return acl_set_tag_type(entry, tagtype);
-}
+	if (acl_set_tag_type(entry, tag_type) != 0)
+		return -1;
 
-int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
-{
-	return acl_set_qualifier(entry, qual);
+	if (tag_type == SMB_ACL_USER || tag_type == SMB_ACL_GROUP) {
+		if (acl_set_qualifier(entry, (void*)&u_g_id) != 0)
+			return -1;
+	}
+
+	return sys_acl_set_access_bits(entry, bits);
 }
 
 int sys_acl_set_access_bits(SMB_ACL_ENTRY_T entry, uint32 bits)
 {
-	SMB_ACL_PERMSET_T permset;
+	acl_permset_t permset;
 	int rc;
 	if ((rc = acl_get_permset(entry, &permset)) != 0)
 		return rc;
@@ -293,10 +297,12 @@ int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl
 	return acl_set_file((char *)name, acltype, theacl);
 }
 
+#if 0
 int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
 {
 	return acl_set_fd(fd, ACL_TYPE_ACCESS, theacl);
 }
+#endif
 
 int sys_acl_delete_def_file(const char *name)
 {
@@ -308,12 +314,7 @@ int sys_acl_free_acl(SMB_ACL_T the_acl)
 	return acl_free(the_acl);
 }
 
-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
-{
-	return acl_free_qualifier(qual, tagtype);
-}
-
-#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS)
+#elif defined(HAVE_UNIXWARE_ACLS) || defined(HAVE_SOLARIS_ACLS) /*-----------*/
 
 /*
  * Donated by Michael Davidson <md@sco.COM> for UnixWare / OpenUNIX.
@@ -385,17 +386,6 @@ int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
 	return 0;
 }
 
-void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
-{
-	if (entry_d->a_type != SMB_ACL_USER
-	    && entry_d->a_type != SMB_ACL_GROUP) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	return &entry_d->a_id;
-}
-
 /*
  * There is no way of knowing what size the ACL returned by
  * GETACL will be unless you first call GETACLCNT which means
@@ -533,9 +523,15 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 }
 #endif
 
-int sys_acl_get_access_bits(SMB_ACL_ENTRY_T entry_d, uint32 *bits)
+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)
 {
-	*bits = entry_d->a_perm;
+	*tag_type_p = entry->a_type;
+
+	*bits_p = entry->a_perm;
+
+	if (*tag_type_p == SMB_ACL_USER || *tag_type_p == SMB_ACL_GROUP)
+		*u_g_id_p = entry->a_id;
+	
 	return 0;
 }
 
@@ -591,34 +587,14 @@ int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
 	return 0;
 }
 
-int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
+int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits, id_t u_g_id)
 {
-	switch (tag_type) {
-		case SMB_ACL_USER:
-		case SMB_ACL_USER_OBJ:
-		case SMB_ACL_GROUP:
-		case SMB_ACL_GROUP_OBJ:
-		case SMB_ACL_OTHER:
-		case SMB_ACL_MASK:
-			entry_d->a_type = tag_type;
-			break;
-		default:
-			errno = EINVAL;
-			return -1;
-	}
+	entry->a_type = tag_type;
 
-	return 0;
-}
+	if (tag_type == SMB_ACL_USER || tag_type == SMB_ACL_GROUP)
+		entry->a_id = u_g_id;
 
-int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
-{
-	if (entry_d->a_type != SMB_ACL_GROUP
-	    && entry_d->a_type != SMB_ACL_USER) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	entry_d->a_id = *((id_t *)qual_p);
+	entry->a_perm = bits;
 
 	return 0;
 }
@@ -751,6 +727,7 @@ int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
 	return ret;
 }
 
+#if 0
 int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
 {
 	if (acl_sort(acl_d) != 0) {
@@ -759,6 +736,7 @@ int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
 
 	return facl(fd, SETACL, acl_d->count, &acl_d->acl[0]);
 }
+#endif
 
 int sys_acl_delete_def_file(const char *path)
 {
@@ -786,12 +764,8 @@ int sys_acl_free_acl(SMB_ACL_T acl_d)
 	return 0;
 }
 
-int sys_acl_free_qualifier(UNUSED(void *qual), UNUSED(SMB_ACL_TAG_T tagtype))
-{
-	return 0;
-}
+#elif defined(HAVE_HPUX_ACLS) /*---------------------------------------------*/
 
-#elif defined(HAVE_HPUX_ACLS)
 #include <dl.h>
 
 /*
@@ -884,17 +858,6 @@ int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
 	return 0;
 }
 
-void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
-{
-	if (entry_d->a_type != SMB_ACL_USER
-	    && entry_d->a_type != SMB_ACL_GROUP) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	return &entry_d->a_id;
-}
-
 /*
  * There is no way of knowing what size the ACL returned by
  * ACL_GET will be unless you first call ACL_CNT which means
@@ -1016,9 +979,14 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 }
 #endif
 
-int sys_acl_get_access_bits(SMB_ACL_ENTRY_T entry_d, uint32 *bits)
+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)
 {
-	*bits = entry_d->a_perm;
+	*tag_type_p = entry->a_type;
+
+	*bits_p = entry->a_perm;
+
+	if (*tag_type_p == SMB_ACL_USER || *tag_type_p == SMB_ACL_GROUP)
+		*u_g_id_p = entry->a_id;
 
 	return 0;
 }
@@ -1075,34 +1043,14 @@ int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
 	return 0;
 }
 
-int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
+int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits, id_t u_g_id)
 {
-	switch (tag_type) {
-		case SMB_ACL_USER:
-		case SMB_ACL_USER_OBJ:
-		case SMB_ACL_GROUP:
-		case SMB_ACL_GROUP_OBJ:
-		case SMB_ACL_OTHER:
-		case SMB_ACL_MASK:
-			entry_d->a_type = tag_type;
-			break;
-		default:
-			errno = EINVAL;
-			return -1;
-	}
+	entry->a_type = tag_type;
 
-	return 0;
-}
-
-int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
-{
-	if (entry_d->a_type != SMB_ACL_GROUP
-	    && entry_d->a_type != SMB_ACL_USER) {
-		errno = EINVAL;
-		return -1;
-	}
+	if (tag_type == SMB_ACL_USER || tag_type == SMB_ACL_GROUP)
+		entry->a_id = u_g_id;
 
-	entry_d->a_id = *((id_t *)qual_p);
+	entry->a_perm = bits;
 
 	return 0;
 }
@@ -1152,7 +1100,7 @@ struct hpux_acl_types {
  *                  acl types.
  */
 
-static int hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
+static void hpux_count_obj(int acl_count, struct acl *aclp, struct hpux_acl_types *acl_type_count)
 {
 	int i;
 
@@ -1593,12 +1541,7 @@ int sys_acl_free_acl(SMB_ACL_T acl_d)
 	return 0;
 }
 
-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
-{
-	return 0;
-}
-
-#elif defined(HAVE_IRIX_ACLS)
+#elif defined(HAVE_IRIX_ACLS) /*---------------------------------------------*/
 
 int sys_acl_get_entry(SMB_ACL_T acl_d, int entry_id, SMB_ACL_ENTRY_T *entry_p)
 {
@@ -1637,17 +1580,6 @@ int sys_acl_get_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *type_p)
 	return 0;
 }
 
-void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
-{
-	if (entry_d->ae_tag != SMB_ACL_USER
-	    && entry_d->ae_tag != SMB_ACL_GROUP) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	return &entry_d->ae_id;
-}
-
 SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
 {
 	SMB_ACL_T	a;
@@ -1684,9 +1616,14 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 }
 #endif
 
-int sys_acl_get_access_bits(SMB_ACL_ENTRY_T entry_d, uint32 *bits)
+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)
 {
-	*bits = entry_d->ae_perm;
+	*tag_type_p = entry->ae_tag;
+
+	*bits_p = entry->ae_perm;
+
+	if (*tag_type_p == SMB_ACL_USER || *tag_type_p == SMB_ACL_GROUP)
+		*u_g_id_p = entry->ae_id;
 
 	return 0;
 }
@@ -1738,34 +1675,14 @@ int sys_acl_create_entry(SMB_ACL_T *acl_p, SMB_ACL_ENTRY_T *entry_p)
 	return 0;
 }
 
-int sys_acl_set_tag_type(SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T tag_type)
+int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits, id_t u_g_id)
 {
-	switch (tag_type) {
-		case SMB_ACL_USER:
-		case SMB_ACL_USER_OBJ:
-		case SMB_ACL_GROUP:
-		case SMB_ACL_GROUP_OBJ:
-		case SMB_ACL_OTHER:
-		case SMB_ACL_MASK:
-			entry_d->ae_tag = tag_type;
-			break;
-		default:
-			errno = EINVAL;
-			return -1;
-	}
+	entry->ae_tag = tag_type;
 
-	return 0;
-}
+	if (tag_type == SMB_ACL_USER || tag_type == SMB_ACL_GROUP)
+		entry->ae_id = u_g_id;
 
-int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p)
-{
-	if (entry_d->ae_tag != SMB_ACL_GROUP
-	    && entry_d->ae_tag != SMB_ACL_USER) {
-		errno = EINVAL;
-		return -1;
-	}
-
-	entry_d->ae_id = *((id_t *)qual_p);
+	entry->ae_perm = bits;
 
 	return 0;
 }
@@ -1787,10 +1704,12 @@ int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
 	return acl_set_file(name, type, acl_d->aclp);
 }
 
+#if 0
 int sys_acl_set_fd(int fd, SMB_ACL_T acl_d)
 {
 	return acl_set_fd(fd, acl_d->aclp);
 }
+#endif
 
 int sys_acl_delete_def_file(const char *name)
 {
@@ -1806,12 +1725,7 @@ int sys_acl_free_acl(SMB_ACL_T acl_d)
 	return 0;
 }
 
-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
-{
-	return 0;
-}
-
-#elif defined(HAVE_AIX_ACLS)
+#elif defined(HAVE_AIX_ACLS) /*----------------------------------------------*/
 
 /* Donated by Medha Date, mdate@austin.ibm.com, for IBM */
 
@@ -1821,6 +1735,13 @@ int sys_acl_get_entry( SMB_ACL_T theacl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
 	struct new_acl_entry *entry;
 	int keep_going;
 
+	if (entry_id == SMB_ACL_FIRST_ENTRY)
+		theacl->count = 0;
+	else if (entry_id != SMB_ACL_NEXT_ENTRY) {
+		errno = EINVAL;
+		return -1;
+	}
+
 	DEBUG(10,("This is the count: %d\n",theacl->count));
 
 	/* Check if count was previously set to -1. *
@@ -1872,7 +1793,7 @@ int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
 	case SMB_ACL_OTHER:
 		*tag_type_p = entry_d->ace_id->id_type;
 		break;
- 
+
 	default:
 		return(-1);
 	}
@@ -1880,24 +1801,6 @@ int sys_acl_get_tag_type( SMB_ACL_ENTRY_T entry_d, SMB_ACL_TAG_T *tag_type_p)
 	return(0);
 }
 
-int sys_acl_get_access_bits(SMB_ACL_ENTRY_T entry_d, uint32 *bits)
-{
-	SMB_ACL_PERMSET_T permset;
-	DEBUG(10,("Starting AIX sys_acl_get_access_bits\n"));
-	permset = &entry_d->ace_access;
-	DEBUG(10,("*permset is %d\n",*permset));
-	*bits = (*permset & S_IRUSR ? 4 : 0)
-	      | (*permset & S_IWUSR ? 2 : 0)
-	      | (*permset & S_IXUSR ? 1 : 0);
-	DEBUG(10,("Ending AIX sys_acl_get_access_bits\n"));
-	return(0);
-}
-
-void *sys_acl_get_qualifier( SMB_ACL_ENTRY_T entry_d)
-{
-	return(entry_d->ace_id->id_data);
-}
-
 SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 {
 	struct acl *file_acl = (struct acl *)NULL;
@@ -1908,7 +1811,6 @@ SMB_ACL_T sys_acl_get_file( const char *path_p, SMB_ACL_TYPE_T type)
 	struct acl_entry_link *acl_entry_link_head;
 	int i;
 	int rc = 0;
-	uid_t user_id;
 
 	/* AIX has no DEFAULT */
 	if  ( type == SMB_ACL_TYPE_DEFAULT ) {
@@ -2129,7 +2031,6 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 	struct acl_entry_link *acl_entry_link_head;
 	int i;
 	int rc = 0;
-	uid_t user_id;
 
 	/* Get the acl using fstatacl */
    
@@ -2335,10 +2236,35 @@ SMB_ACL_T sys_acl_get_fd(int fd)
 }
 #endif
 
+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)
+{
+	uint *permset;
+
+	if (sys_acl_get_tag_type(entry, tag_type_p) != 0)
+		return -1;
+
+	if (*tag_type_p == SMB_ACL_USER || *tag_type_p == SMB_ACL_GROUP)
+		memcpy(u_g_id_p, entry->ace_id->id_data, sizeof (id_t));
+
+	permset = &entry->ace_access;
+
+	DEBUG(10,("*permset is %d\n",*permset));
+	*bits_p = (*permset & S_IRUSR ? 4 : 0)
+		| (*permset & S_IWUSR ? 2 : 0)
+		| (*permset & S_IXUSR ? 1 : 0);
+
+	return 0;
+}
+
 SMB_ACL_T sys_acl_init( int count)
 {
 	struct acl_entry_link *theacl = NULL;
  
+	if (count < 0) {
+		errno = EINVAL;
+		return NULL;
+	}
+
 	DEBUG(10,("Entering sys_acl_init\n"));
 
 	theacl = SMB_MALLOC_P(struct acl_entry_link);
@@ -2405,20 +2331,18 @@ int sys_acl_create_entry( SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
 	return(0);
 }
 
-int sys_acl_set_tag_type( SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tagtype)
+int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits, id_t u_g_id)
 {
-	DEBUG(10,("Starting AIX sys_acl_set_tag_type\n"));
-	entry->ace_id->id_type = tagtype;
+	entry->ace_id->id_type = tag_type;
 	DEBUG(10,("The tag type is %d\n",entry->ace_id->id_type));
-	DEBUG(10,("Ending AIX sys_acl_set_tag_type\n"));
-}
 
-int sys_acl_set_qualifier( SMB_ACL_ENTRY_T entry, void *qual)
-{
-	DEBUG(10,("Starting AIX sys_acl_set_qualifier\n"));
-	memcpy(entry->ace_id->id_data,qual,sizeof(uid_t));
-	DEBUG(10,("Ending AIX sys_acl_set_qualifier\n"));
-	return(0);
+	if (tag_type == SMB_ACL_USER || tag_type == SMB_ACL_GROUP)
+		memcpy(entry->ace_id->id_data, &u_g_id, sizeof (id_t));
+
+	entry->ace_access = bits;
+	DEBUG(10,("entry->ace_access = %d\n",entry->ace_access));
+
+	return 0;
 }
 
 int sys_acl_set_access_bits(SMB_ACL_ENTRY_T entry, uint32 bits)
@@ -2459,7 +2383,6 @@ int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl
 	struct acl_entry *acl_entry = NULL;
 	struct ace_id *ace_id = NULL;
 	uint id_type;
-	uint ace_access;
 	uint user_id;
 	uint acl_length;
 	uint rc;
@@ -2538,7 +2461,7 @@ int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl
 		memcpy(acl_entry->ace_id->id_data, &user_id, sizeof(uid_t));
 	}
 
-	rc = chacl(name,file_acl,file_acl->acl_len);
+	rc = chacl((char*)name,file_acl,file_acl->acl_len);
 	DEBUG(10,("errno is %d\n",errno));
 	DEBUG(10,("return code is %d\n",rc));
 	SAFE_FREE(file_acl);
@@ -2546,6 +2469,7 @@ int sys_acl_set_file( const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl
 	return(rc);
 }
 
+#if 0
 int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
 {
 	struct acl_entry_link *acl_entry_link = NULL;
@@ -2634,8 +2558,9 @@ int sys_acl_set_fd( int fd, SMB_ACL_T theacl)
 	DEBUG(10,("Exiting sys_acl_set_fd\n"));
 	return(rc);
 }
+#endif
 
-int sys_acl_delete_def_file(const char *name)
+int sys_acl_delete_def_file(UNUSED(const char *name))
 {
 	/* AIX has no default ACL */
 	return 0;
@@ -2658,9 +2583,170 @@ int sys_acl_free_acl(SMB_ACL_T posix_acl)
 	return(0);
 }
 
-int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
+#elif defined(HAVE_OSX_ACLS) /*----------------------------------------------*/
+
+#define OSX_BROKEN_GETENTRY /* returns 0 instead of 1 */
+
+#include <membership.h>
+
+int sys_acl_get_entry(SMB_ACL_T the_acl, int entry_id, SMB_ACL_ENTRY_T *entry_p)
 {
-	return(0);
+	int ret = acl_get_entry(the_acl, entry_id, entry_p);
+#ifdef OSX_BROKEN_GETENTRY
+	if (ret == 0)
+		ret = 1;
+	else if (ret == -1 && errno == 22)
+		ret = 0;
+#endif
+	return ret;
+}
+
+SMB_ACL_T sys_acl_get_file(const char *path_p, SMB_ACL_TYPE_T type)
+{
+	if (type == ACL_TYPE_DEFAULT) {
+		errno = ENOTSUP;
+		return NULL;
+	}
+	errno = 0;
+	return acl_get_file(path_p, type);
+}
+
+#if 0
+SMB_ACL_T sys_acl_get_fd(int fd)
+{
+	return acl_get_fd(fd);
+}
+#endif
+
+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)
+{
+	uuid_t *uup;
+	acl_tag_t tag;
+	acl_flagset_t flagset;
+	acl_permset_t permset;
+	uint32 bits, fb, bb, pb;
+	int id_type = -1;
+	int rc;
+
+	if (acl_get_tag_type(entry, &tag) != 0
+	 || acl_get_flagset_np(entry, &flagset) != 0
+	 || acl_get_permset(entry, &permset) != 0
+	 || (uup = acl_get_qualifier(entry)) == NULL)
+		return -1;
+
+	rc = mbr_uuid_to_id(*uup, u_g_id_p, &id_type);
+	acl_free(uup);
+	if (rc != 0)
+		return rc;
+
+	if (id_type == ID_TYPE_UID)
+		*tag_type_p = SMB_ACL_USER;
+	else
+		*tag_type_p = SMB_ACL_GROUP;
+
+	bits = tag == ACL_EXTENDED_ALLOW ? 1 : 0;
+
+	for (fb = (1u<<4), bb = (1u<<1); bb < (1u<<12); fb *= 2, bb *= 2) {
+		if (acl_get_flag_np(flagset, fb) == 1)
+			bits |= bb;
+	}
+
+	for (pb = (1u<<1), bb = (1u<<12); bb < (1u<<25); pb *= 2, bb *= 2) {
+		if (acl_get_perm_np(permset, pb) == 1)
+			bits |= bb;
+	}
+
+	*bits_p = bits;
+
+	return 0;
+}
+
+SMB_ACL_T sys_acl_init(int count)
+{
+	return acl_init(count);
+}
+
+int sys_acl_create_entry(SMB_ACL_T *pacl, SMB_ACL_ENTRY_T *pentry)
+{
+	return acl_create_entry(pacl, pentry);
+}
+
+int sys_acl_set_info(SMB_ACL_ENTRY_T entry, SMB_ACL_TAG_T tag_type, uint32 bits, id_t u_g_id)
+{
+	acl_flagset_t flagset;
+	acl_permset_t permset;
+	uint32 fb, bb, pb;
+	int is_user = tag_type == SMB_ACL_USER;
+	uuid_t uu;
+	int rc;
+
+	tag_type = bits & 1 ? ACL_EXTENDED_ALLOW : ACL_EXTENDED_DENY;
+
+	if (acl_get_flagset_np(entry, &flagset) != 0
+	 || acl_get_permset(entry, &permset) != 0)
+		return -1;
+
+	acl_clear_flags_np(flagset);
+	acl_clear_perms(permset);
+
+	for (fb = (1u<<4), bb = (1u<<1); bb < (1u<<12); fb *= 2, bb *= 2) {
+		if (bits & bb)
+			acl_add_flag_np(flagset, fb);
+	}
+
+	for (pb = (1u<<1), bb = (1u<<12); bb < (1u<<25); pb *= 2, bb *= 2) {
+		if (bits & bb)
+			acl_add_perm(permset, pb);
+	}
+
+	if (is_user)
+		rc = mbr_uid_to_uuid(u_g_id, uu);
+	else
+		rc = mbr_gid_to_uuid(u_g_id, uu);
+	if (rc != 0)
+		return rc;
+
+	if (acl_set_tag_type(entry, tag_type) != 0
+	 || acl_set_qualifier(entry, &uu) != 0
+	 || acl_set_permset(entry, permset) != 0
+	 || acl_set_flagset_np(entry, flagset) != 0)
+		return -1;
+
+	return 0;
+}
+
+#if 0
+int sys_acl_set_access_bits(SMB_ACL_ENTRY_T entry, uint32 bits)
+{
+	return -1; /* Not needed for OS X. */
+}
+#endif
+
+int sys_acl_valid(SMB_ACL_T theacl)
+{
+	return acl_valid(theacl);
+}
+
+int sys_acl_set_file(const char *name, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
+{
+	return acl_set_file(name, acltype, theacl);
+}
+
+#if 0
+int sys_acl_set_fd(int fd, SMB_ACL_T theacl)
+{
+	return acl_set_fd(fd, theacl);
+}
+#endif
+
+int sys_acl_delete_def_file(const char *name)
+{
+	return acl_delete_def_file(name);
+}
+
+int sys_acl_free_acl(SMB_ACL_T the_acl)
+{
+	return acl_free(the_acl);
 }
 
 #else /* No ACLs. */
@@ -2676,6 +2762,10 @@ int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype)
 
 int no_acl_syscall_error(int err)
 {
+#ifdef HAVE_OSX_ACLS
+	if (err == ENOENT)
+		return 1; /* Weird problem with directory ACLs. */
+#endif
 #if defined(ENOSYS)
 	if (err == ENOSYS) {
 		return 1;