summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2008-09-08 16:42:06 +0200
committerVolker Lendecke <vl@samba.org>2008-09-08 16:53:54 +0200
commitd4b41079cb6bfffa75e3d7b188ab4331f7aa32b8 (patch)
treee2b09a320bbc1692c8b79b1e8df0eeeb22040e81 /source3
parent95b366d8e19909c354ce241f663cba6f674744f9 (diff)
downloadsamba-d4b41079cb6bfffa75e3d7b188ab4331f7aa32b8.tar.gz
samba-d4b41079cb6bfffa75e3d7b188ab4331f7aa32b8.tar.bz2
samba-d4b41079cb6bfffa75e3d7b188ab4331f7aa32b8.zip
When setting an NFSv4 ACL, map generic bits
(This used to be commit dbe7a61be2beac50d1665e38ac374cefbbabec00)
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/nfs4_acls.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index dc1b70ccb7..9e28db8b39 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/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));