More cleanup work on permissions restore:

  * Rename some variables/functions/etc to try to make things clearer.
  * Add separate flags to control fflag/acl restore
  * Collect metadata restore into a single function for clarity
  * Propagate errors in metadata restore back out to the client
  * Fix some places where errors were being returned when they
    shouldn't and vice-versa
  * Modes are now always restored; ARCHIVE_EXTRACT_PERM just controls
    whether or not umask is obeyed.
  * Restore suid/sgid bits only if user/group matches archive
  * Cache the last stat results to try to reduce the number of stat calls

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/libarchive/archive.h.in b/lib/libarchive/archive.h.in
index 4bef0c9..6f052f9 100644
--- a/lib/libarchive/archive.h.in
+++ b/lib/libarchive/archive.h.in
@@ -208,6 +208,8 @@ int		 archive_read_data_into_fd(struct archive *, int fd);
 #define	ARCHIVE_EXTRACT_TIME	(4) /* Default: mod time not restored */
 #define	ARCHIVE_EXTRACT_NO_OVERWRITE (8) /* Default: Replace files on disk */
 #define	ARCHIVE_EXTRACT_UNLINK	(16) /* Default: don't unlink existing files */
+#define	ARCHIVE_EXTRACT_ACL	(32) /* Default: don't restore ACLs */
+#define	ARCHIVE_EXTRACT_FFLAGS	(64) /* Default: don't restore fflags */
 
 int		 archive_read_extract(struct archive *, struct archive_entry *,
 		     int flags);