summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-11-29 11:55:39 -0800
committerJeremy Allison <jra@samba.org>2011-11-29 22:32:27 +0100
commit6bf97ea3bc70745f64f82251cbce443f2637c703 (patch)
tree5119f418c4167ae1339f429186cb1e49a721b375
parent3ab37a0d0e8da0a149f3b0c4b0f54d4a7e8a66cf (diff)
downloadsamba-6bf97ea3bc70745f64f82251cbce443f2637c703.tar.gz
samba-6bf97ea3bc70745f64f82251cbce443f2637c703.tar.bz2
samba-6bf97ea3bc70745f64f82251cbce443f2637c703.zip
Fix bug 8631 - POSIX ACE x permission becomes rx following mapping to and from a DACL
Reported by David Disseldorp. Fix based on a patch by David. Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Tue Nov 29 22:32:27 CET 2011 on sn-devel-104
-rw-r--r--source3/smbd/posix_acls.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c
index b69177a92d..2ed64c2472 100644
--- a/source3/smbd/posix_acls.c
+++ b/source3/smbd/posix_acls.c
@@ -1130,8 +1130,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)