[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3949-g77b3ca1

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  77b3ca1a4be4ae780186ab4d46ec114b8dea41a8 (commit)
      from  4df7f57b612a361b56a40b2591ac8b1d9c899d8c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 77b3ca1a4be4ae780186ab4d46ec114b8dea41a8
Author: Volker Lendecke <vl at sernet.de>
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 dc1b70c..9e28db8 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));


-- 
Samba Shared Repository