diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2017-03-20 13:02:27 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2017-03-20 13:02:27 +0000 |
| commit | 4657548d18877f64bd02be888406aa5b02bf9b06 (patch) | |
| tree | a799a9cee40e53706103a717a7c73fb3ba1f6aa1 /contrib/libarchive/tar | |
| parent | 90589b904f71be5b92a8dbea319f5ef6c4a89d80 (diff) | |
| parent | 4a7f6834348e3853977e1b7d69ff44f6eb93313c (diff) | |
| download | src-4657548d18877f64bd02be888406aa5b02bf9b06.tar.gz src-4657548d18877f64bd02be888406aa5b02bf9b06.zip | |
Notes
Diffstat (limited to 'contrib/libarchive/tar')
| -rw-r--r-- | contrib/libarchive/tar/bsdtar.1 | 2 | ||||
| -rw-r--r-- | contrib/libarchive/tar/test/test_option_acls.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/contrib/libarchive/tar/bsdtar.1 b/contrib/libarchive/tar/bsdtar.1 index 3e7abe884126..0537bf36b20d 100644 --- a/contrib/libarchive/tar/bsdtar.1 +++ b/contrib/libarchive/tar/bsdtar.1 @@ -640,7 +640,7 @@ This option suppresses these behaviors. (x mode only) Preserve file permissions. Attempt to restore the full permissions, including owner, file modes, ACLs, -extended atributes and extended file flags, if available, for each item +extended attributes and extended file flags, if available, for each item extracted from the archive. This is te reverse of .Fl Fl no-same-permissions and the default if diff --git a/contrib/libarchive/tar/test/test_option_acls.c b/contrib/libarchive/tar/test/test_option_acls.c index 5c3fbfd156c8..bfe2b994bde5 100644 --- a/contrib/libarchive/tar/test/test_option_acls.c +++ b/contrib/libarchive/tar/test/test_option_acls.c @@ -73,8 +73,6 @@ static const acl_perm_t acl_perms[] = { #if HAVE_DARWIN_ACL || HAVE_FREEBSD_NFS4_ACL static const acl_flag_t acl_flags[] = { #if HAVE_DARWIN_ACL - ACL_FLAG_DEFER_INHERIT, - ACL_FLAG_NO_INHERIT, ACL_ENTRY_INHERITED, ACL_ENTRY_FILE_INHERIT, ACL_ENTRY_DIRECTORY_INHERIT, |