]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Replace archive_entry_acl_count() with archive_entry_acl_types()
authorMartin Matuska <martin@matuska.org>
Sun, 19 Feb 2017 00:45:03 +0000 (01:45 +0100)
committerMartin Matuska <martin@matuska.org>
Sun, 19 Feb 2017 01:38:07 +0000 (02:38 +0100)
in one more place.

libarchive/archive_read_disk_entry_from_file.c

index ff3cd27afe9eff2fed6b0ee3fa66445d7be93c41..591a2125467689debebe468530631b34240a3a1a 100644 (file)
@@ -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);