From 0c6ea74ed9c7c01eeb71f2eab35761adf3d28ce3 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Wed, 4 Jan 2017 14:07:50 +0100 Subject: [PATCH] If possible read default ACLs with acl_get_fd_np() --- libarchive/archive_read_disk_entry_from_file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c index 0a5453c64..da28046a9 100644 --- a/libarchive/archive_read_disk_entry_from_file.c +++ b/libarchive/archive_read_disk_entry_from_file.c @@ -526,6 +526,11 @@ setup_acls(struct archive_read_disk *a, /* Only directories can have default ACLs. */ if (S_ISDIR(archive_entry_mode(entry))) { +#if HAVE_ACL_GET_FD_NP + if (*fd >= 0) + acl = acl_get_fd_np(*fd, ACL_TYPE_DEFAULT); + else +#endif acl = acl_get_file(accpath, ACL_TYPE_DEFAULT); if (acl != NULL) { r = translate_acl(a, entry, acl, -- 2.47.2