Fix bug 8631 - POSIX ACE x permission becomes rx following mapping to and from a...

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue Nov 29 22:32:27 CET 2011 on sn-devel-104
(cherry picked from commit 6bf97ea3bc70745f64f82251cbce443f2637c703)
(cherry picked from commit 28fa8d8d777f3da40fde2fb57cd06659f76cf658)
(cherry picked from commit 8d8d7a1c7f2b085801bfb7b4c4885969e1d7fce1)

diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index 555f9c00fd2495aa31d4de16e0935feab7ec2533..78b373a1cd136750a47f3cf7f40605ae5b781537 100644 (file)
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1123,8 +1123,8 @@ uint32_t map_canon_ace_perms(int snum,
  Map NT perms to a UNIX mode_t.
 ****************************************************************************/
 
-#define FILE_SPECIFIC_READ_BITS (FILE_READ_DATA|FILE_READ_EA|FILE_READ_ATTRIBUTES)
-#define FILE_SPECIFIC_WRITE_BITS (FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_WRITE_EA|FILE_WRITE_ATTRIBUTES)
+#define FILE_SPECIFIC_READ_BITS (FILE_READ_DATA|FILE_READ_EA)
+#define FILE_SPECIFIC_WRITE_BITS (FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_WRITE_EA)
 #define FILE_SPECIFIC_EXECUTE_BITS (FILE_EXECUTE)
 
 static mode_t map_nt_perms( uint32 *mask, int type)