From: Joerg Sonnenberger <joerg@bec.de>
Date: Tue, 21 Jun 2016 16:29:07 +0000 (+0200)
Subject: Dummy out copy_acls if sys/acl.h is missing or ACL support is disabled.
X-Git-Tag: v3.2.2~50
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e66829717c8fde611b2b611497f08a46da40ce7;p=thirdparty%2Flibarchive.git

Dummy out copy_acls if sys/acl.h is missing or ACL support is disabled.
---

diff --git a/libarchive/archive_write_disk_posix.c b/libarchive/archive_write_disk_posix.c
index 6737cd755..67aacf15a 100644
--- a/libarchive/archive_write_disk_posix.c
+++ b/libarchive/archive_write_disk_posix.c
@@ -3487,6 +3487,9 @@ exit_xattr:
 static int
 copy_acls(struct archive_write_disk *a, int tmpfd, int dffd)
 {
+#ifndef HAVE_SYS_ACL_H
+	return 0;
+#else
 	acl_t acl, dfacl = NULL;
 	int acl_r, ret = ARCHIVE_OK;
 
@@ -3514,6 +3517,7 @@ exit_acl:
 	if (dfacl)
 		acl_free(dfacl);
 	return (ret);
+#endif
 }
 
 static int