commit 891bf1056cfc6cb38bba73dee17157ab7cea0e04
author Martin Matuska <martin@matuska.org> Sun Feb 19 01:45:03 2017 +0100
committer Martin Matuska <martin@matuska.org> Sun Feb 19 02:38:07 2017 +0100
tree 8823396545039fa44ce514fb17d8aff9226c61c9
parent 433e36b049f1ffcec9f7aca27c33ab35b433d4b2

Replace archive_entry_acl_count() with archive_entry_acl_types()
in one more place.

libarchive/archive_read_disk_entry_from_file.c

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index ff3cd27..591a212 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -551,8 +551,8 @@
 		 * the archive entry. Otherwise extraction on non-Mac platforms
 		 * would lead to an invalid file mode.
 		 */
-		if (archive_entry_acl_count(entry,
-		    ARCHIVE_ENTRY_ACL_TYPE_NFS4) > 0)
+		if ((archive_entry_acl_types(entry) &
+		    ARCHIVE_ENTRY_ACL_TYPE_NFS4) != 0)
 			add_trivial_nfs4_acl(entry);
 #endif
 		return (r);