The branch, v3-2-test has been updated via c2faa48abce1d656527b89f601e084e3ba70e36d (commit) from 9082c77af4fb9fda6bb0a85810e454302130a71f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit c2faa48abce1d656527b89f601e084e3ba70e36d Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Mon Sep 8 16:42:06 2008 +0200 When setting an NFSv4 ACL, map generic bits (cherry picked from commit dbe7a61be2beac50d1665e38ac374cefbbabec00) ----------------------------------------------------------------------- Summary of changes: source/modules/nfs4_acls.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/modules/nfs4_acls.c b/source/modules/nfs4_acls.c index 0c3d010..5e90afa 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 { @@ -529,6 +531,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)); -- Samba Shared Repository