diff options
| author | joerg <joerg@pkgsrc.org> | 2016-06-21 16:29:55 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-06-21 16:29:55 +0000 |
| commit | 8bee4357ae14f681275c71396f3f72329cc11089 (patch) | |
| tree | 8ddcd2408cd2cc1c9336f891df30a0d7d97be63b /archivers/libarchive/files | |
| parent | 83b01b0d69efd8e7e1e45fc8bae315f6b31c769c (diff) | |
| download | pkgsrc-8bee4357ae14f681275c71396f3f72329cc11089.tar.gz | |
From upstream: Dummy out copy_acls if sys/acl.h is missing or ACL
support is disabled.
Diffstat (limited to 'archivers/libarchive/files')
| -rw-r--r-- | archivers/libarchive/files/libarchive/archive_write_disk_posix.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/archivers/libarchive/files/libarchive/archive_write_disk_posix.c b/archivers/libarchive/files/libarchive/archive_write_disk_posix.c index 6737cd755b2..67aacf15a00 100644 --- a/archivers/libarchive/files/libarchive/archive_write_disk_posix.c +++ b/archivers/libarchive/files/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 |