summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2007-03-08 06:07:07 +0000
committerkientzle <kientzle@FreeBSD.org>2007-03-08 06:07:07 +0000
commit4e920aa7c052f62027cb1ed20263ce2b499bfd84 (patch)
tree36ac5eadd7de228f2bcd37880a20d268e4325d0d
parent4f72159a41f5e0ca35644948d1641ff55bd0a866 (diff)
downloadFreeBSD-src-4e920aa7c052f62027cb1ed20263ce2b499bfd84.zip
FreeBSD-src-4e920aa7c052f62027cb1ed20263ce2b499bfd84.tar.gz
Distinguish between the end of ACL data and an error in pulling
ACL data from the archive entry. This doesn't impact archive_read_extract or archive_write_disk since they only check for != ARCHIVE_OK when calling this function. (Though they should be more careful.)
-rw-r--r--lib/libarchive/archive_entry.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libarchive/archive_entry.c b/lib/libarchive/archive_entry.c
index 646f314..d019d06 100644
--- a/lib/libarchive/archive_entry.c
+++ b/lib/libarchive/archive_entry.c
@@ -1032,7 +1032,7 @@ archive_entry_acl_next(struct archive_entry *entry, int want_type, int *type,
entry->acl_p = entry->acl_p->next;
if (entry->acl_p == NULL) {
entry->acl_state = 0;
- return (ARCHIVE_WARN);
+ return (ARCHIVE_EOF); /* End of ACL entries. */
}
*type = entry->acl_p->type;
*permset = entry->acl_p->permset;
OpenPOWER on IntegriCloud