From ba358940ad4e37b942e6e1a0c838a01bd6a7b0c0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 8 Sep 2008 16:42:06 +0200 Subject: [PATCH] When setting an NFSv4 ACL, map generic bits (cherry picked from commit dbe7a61be2beac50d1665e38ac374cefbbabec00) (cherry picked from commit 77b3ca1a4be4ae780186ab4d46ec114b8dea41a8) --- source/modules/nfs4_acls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/modules/nfs4_acls.c b/source/modules/nfs4_acls.c index dc1b70ccb70..9e28db8b396 100644 --- a/source/modules/nfs4_acls.c +++ b/source/modules/nfs4_acls.c @@ -25,6 +25,8 @@ #define SMBACL4_PARAM_TYPE_NAME "nfs4" +extern const struct generic_mapping file_generic_mapping; + #define SMB_ACE4_INT_MAGIC 0x76F8A967 typedef struct _SMB_ACE4_INT_T { @@ -528,6 +530,8 @@ static bool smbacl4_fill_ace4( ace_v4->aceMask = ace_nt->access_mask & (STD_RIGHT_ALL_ACCESS | SA_RIGHT_FILE_ALL_ACCESS); + se_map_generic(&ace_v4->aceMask, &file_generic_mapping); + if (ace_v4->aceFlags!=ace_nt->flags) DEBUG(9, ("ace_v4->aceFlags(0x%x)!=ace_nt->flags(0x%x)\n", ace_v4->aceFlags, ace_nt->flags)); -- 2.11.4.GIT