diff options
| author | Martin Matuska <martin@matuska.org> | 2016-12-27 23:21:39 +0100 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2016-12-27 23:21:39 +0100 |
| commit | 379867ecb330b3a952fb7bfa7bffb7bbd5547205 (patch) | |
| tree | d129a4f831519f0dc129831d7f1031d08cea176e /libarchive/archive_read_disk_entry_from_file.c | |
| parent | 42a3408ac7df1e69bea9ea12b72e14f59f7400c0 (diff) | |
| download | libarchive-379867ecb330b3a952fb7bfa7bffb7bbd5547205.tar.gz | |
Extend NFSv4 ACL support in libarchive
Break up, simplify and improve OS-independent ACL code
Add star-compatible NFSv4 ACL read/write support to pax (SCHILY.acl.ace)
Remap ARCHIVE_ACL_ENTRY_STYLE_* flags
New functions:
archive_entry_acl_from_text()
archive_entry_acl_from_text_w()
archive_entry_acl_to_text()
archive_entry_acl_to_text_w()
Deprecated functions:
archive_entry_acl_text()
archive_entry_acl_text_w()
Closes #771
Diffstat (limited to 'libarchive/archive_read_disk_entry_from_file.c')
| -rw-r--r-- | libarchive/archive_read_disk_entry_from_file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c index f37bb162..0a5453c6 100644 --- a/libarchive/archive_read_disk_entry_from_file.c +++ b/libarchive/archive_read_disk_entry_from_file.c @@ -1,6 +1,7 @@ /*- * Copyright (c) 2003-2009 Tim Kientzle * Copyright (c) 2010-2012 Michihiro NAKAJIMA + * Copyright (c) 2016 Martin Matuska * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -440,7 +441,7 @@ setup_acls(struct archive_read_disk *a, acl = NULL; #ifdef ACL_TYPE_NFS4 - /* Try NFS4 ACL first. */ + /* Try NFSv4 ACL first. */ if (*fd >= 0) #if HAVE_ACL_GET_FD_NP acl = acl_get_fd_np(*fd, ACL_TYPE_NFS4); |