diff options
Diffstat (limited to 'sys-apps/acl/files/0007-NFSv4-POSIX-relax-inheritance-bit-mapping.patch')
| -rw-r--r-- | sys-apps/acl/files/0007-NFSv4-POSIX-relax-inheritance-bit-mapping.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/sys-apps/acl/files/0007-NFSv4-POSIX-relax-inheritance-bit-mapping.patch b/sys-apps/acl/files/0007-NFSv4-POSIX-relax-inheritance-bit-mapping.patch deleted file mode 100644 index 48d2bd6..0000000 --- a/sys-apps/acl/files/0007-NFSv4-POSIX-relax-inheritance-bit-mapping.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ac166c83ea05339fe197b56ea906bed558481eec Mon Sep 17 00:00:00 2001 -From: "J. Bruce Fields" <bfields@snoopy.citi.umich.edu> -Date: Tue, 12 Dec 2006 17:06:17 -0500 -Subject: [PATCH 07/17] NFSv4->POSIX: relax inheritance bit mapping - -Relax the inheritance bit mapping, and make it a little more accurate. ---- - libacl/acl_n4tp_acl_trans.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/libacl/acl_n4tp_acl_trans.c b/libacl/acl_n4tp_acl_trans.c -index 0e505c4..f0f802d 100644 ---- a/libacl/acl_n4tp_acl_trans.c -+++ b/libacl/acl_n4tp_acl_trans.c -@@ -384,6 +384,9 @@ acl_t acl_n4tp_acl_trans(struct nfs4_acl * nacl_p, acl_type_t ptype) - * requested */ - cur_ace = temp_acl->ace_head.tqh_first; - -+#define FILE_OR_DIR_INHERIT (NFS4_ACE_FILE_INHERIT_ACE \ -+ | NFS4_ACE_DIRECTORY_INHERIT_ACE) -+ - while (cur_ace) { - /* get the next ace now in case we free the current ace */ - temp_ace = cur_ace; -@@ -392,12 +395,11 @@ acl_t acl_n4tp_acl_trans(struct nfs4_acl * nacl_p, acl_type_t ptype) - flags = temp_ace->flag; - - if (iflags & NFS4_ACL_REQUEST_DEFAULT) { -- if((flags & NFS4_INHERITANCE_FLAGS) != NFS4_INHERITANCE_FLAGS) -+ if (!(temp_ace->flag & FILE_OR_DIR_INHERIT)) - acl_nfs4_remove_ace(temp_acl, temp_ace); - } else { -- if ((flags & NFS4_INHERITANCE_FLAGS) == NFS4_INHERITANCE_FLAGS) { -+ if (temp_ace->flag & NFS4_ACE_INHERIT_ONLY_ACE) - acl_nfs4_remove_ace(temp_acl, temp_ace); -- } - } - } - --- -1.7.8.1 - |