From: Martin Matuska <martin@matuska.org>
Date: Sun, 19 Feb 2017 00:45:03 +0000 (+0100)
Subject: Replace archive_entry_acl_count() with archive_entry_acl_types()
X-Git-Tag: v3.3.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=891bf1056cfc6cb38bba73dee17157ab7cea0e04;p=thirdparty%2Flibarchive.git

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

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index ff3cd27af..591a21254 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -551,8 +551,8 @@ setup_acls(struct archive_read_disk *a,
 		 * 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);