 @@ -18178,27 +18178,27 @@ ac_fn_c_check_decl "$LINENO" "ACL_USER"
 		#include <sys/acl.h>
+"
 if test "x$ac_cv_have_decl_ACL_USER" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_ACL_USER $ac_have_decl
 _ACEOF
-    # FreeBSD and MacOS ACL support
+    # MacOS ACL support
     ac_fn_c_check_decl "$LINENO" "ACL_TYPE_EXTENDED" "ac_cv_have_decl_ACL_TYPE_EXTENDED" "#include <sys/types.h>
 		#include <sys/acl.h>
+"
 if test "x$ac_cv_have_decl_ACL_TYPE_EXTENDED" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
 fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_ACL_TYPE_EXTENDED $ac_have_decl
 _ACEOF
 ac_fn_c_check_decl "$LINENO" "ACL_SYNCHRONIZE" "ac_cv_have_decl_ACL_SYNCHRONIZE" "#include <sys/types.h>

 @@ -734,27 +734,27 @@ if test "x$enable_acl" != "xno"; then
 	#endif
 	#if HAVE_SYS_ACL_H
 	#include <sys/acl.h>
 	#endif
 	])
     # FreeBSD and POSIX
     # MacOS has no ACL_USER in acl.h
     AC_CHECK_DECLS([ACL_TYPE_NFS4, ACL_USER],
 		[], [],
 		[#include <sys/types.h>
 		#include <sys/acl.h>])
-    # FreeBSD and MacOS ACL support
+    # MacOS ACL support
     AC_CHECK_DECLS([ACL_TYPE_EXTENDED, ACL_SYNCHRONIZE], [], [],
 		[#include <sys/types.h>
 		#include <sys/acl.h>])
     # Solaris and derivates ACLs
     AC_CHECK_TYPES([aclent_t], [], [], [[#include <sys/acl.h>]])
     AC_CHECK_TYPES([ace_t], [], [], [[#include <sys/acl.h>]])
     AC_CHECK_FUNCS(acl facl)
     AC_CHECK_DECLS([GETACL, SETACL, GETACLCNT, ACE_GETACL, ACE_SETACL, ACE_GETACLCNT], [], [], [#include <sys/acl.h>])
 fi
 # Additional requirements
 AC_SYS_LARGEFILE

 @@ -414,41 +414,39 @@ set_acl(struct archive *a, int fd, const
 #if HAVE_SUN_NFS4_ACL
 		case ARCHIVE_ENTRY_ACL_EVERYONE:
 			if (ace != NULL)
 				ace->a_flags |= ACE_EVERYONE;
 			break;
 #endif
 #else	/* !HAVE_SUN_ACL */
 		case ARCHIVE_ENTRY_ACL_USER:
 			ae_uid = archive_write_disk_uid(a, ae_name, ae_id);
 #if !HAVE_DARWIN_ACL	/* FreeBSD, Linux */
 			acl_set_tag_type(acl_entry, ACL_USER);
 			acl_set_qualifier(acl_entry, &ae_uid);
 #else	/* MacOS */
-			if (mbr_identifier_to_uuid(ID_TYPE_UID, &ae_uid,
+			if (mbr_uid_to_uuid(ae_uid, ae_uuid) != 0)
 			    sizeof(uid_t), ae_uuid) != 0)
 				continue;
 			if (acl_set_qualifier(acl_entry, &ae_uuid) != 0)
 				continue;
 #endif	/* HAVE_DARWIN_ACL */
 			break;
 		case ARCHIVE_ENTRY_ACL_GROUP:
 			ae_gid = archive_write_disk_gid(a, ae_name, ae_id);
 #if !HAVE_DARWIN_ACL	/* FreeBSD, Linux */
 			acl_set_tag_type(acl_entry, ACL_GROUP);
 			acl_set_qualifier(acl_entry, &ae_gid);
 #else	/* MacOS */
-			if (mbr_identifier_to_uuid(ID_TYPE_GID, &ae_gid,
+			if (mbr_gid_to_uuid(ae_gid, ae_uuid) != 0)
 			    sizeof(gid_t), ae_uuid) != 0)
 				continue;
 			if (acl_set_qualifier(acl_entry, &ae_uuid) != 0)
 				continue;
 #endif	/* HAVE_DARWIN_ACL */
 			break;
 #if !HAVE_DARWIN_ACL	/* FreeBSD, Linux */
 		case ARCHIVE_ENTRY_ACL_USER_OBJ:
 			acl_set_tag_type(acl_entry, ACL_USER_OBJ);
 			break;
 		case ARCHIVE_ENTRY_ACL_GROUP_OBJ:
 			acl_set_tag_type(acl_entry, ACL_GROUP_OBJ);
 			break;
 		case ARCHIVE_ENTRY_ACL_MASK:

 @@ -119,27 +119,27 @@
 #ifndef O_BINARY
 #define	O_BINARY 0
 #endif
 /*
  * If this platform has <sys/acl.h>, acl_create(), acl_init(),
  * acl_set_file(), and ACL_USER, we assume it has the rest of the
  * POSIX.1e draft functions used in archive_read_extract.c.
  */
 #if HAVE_SYS_ACL_H && HAVE_ACL_CREATE_ENTRY && HAVE_ACL_INIT && HAVE_ACL_SET_FILE
 #if HAVE_DECL_ACL_USER
 #define	HAVE_POSIX_ACL	1
-#elif HAVE_DECL_ACL_TYPE_EXTENDED
+#elif HAVE_DECL_ACL_TYPE_EXTENDED && HAVE_MEMBERSHIP_H
 #define	HAVE_DARWIN_ACL	1
 #endif
 #if HAVE_DECL_ACL_TYPE_NFS4
 #define	HAVE_FREEBSD_NFS4_ACL 1
 #endif
 #endif
 /*
  * If this platform has <sys/acl.h>, acl_get(), facl_get(), acl_set(),
  * facl_set() and types aclent_t and ace_t it uses Solaris-style ACL functions
  */
 #if HAVE_SYS_ACL_H && HAVE_ACL && HAVE_FACL && HAVE_ACLENT_T && \
     HAVE_DECL_GETACL && HAVE_DECL_GETACLCNT && HAVE_DECL_SETACL