summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-05-18 20:16:55 +0000
committerJeremy Allison <jra@samba.org>2001-05-18 20:16:55 +0000
commit58339ac6ccf6e6d264dfbfd6bf9bcf336e90256d (patch)
tree3477dd1bea5267c87db681f0b9904c643aa247e1
parenta8f8d81d541371e79bcaee5ef1927b6411a495de (diff)
downloadsamba-58339ac6ccf6e6d264dfbfd6bf9bcf336e90256d.tar.gz
samba-58339ac6ccf6e6d264dfbfd6bf9bcf336e90256d.tar.bz2
samba-58339ac6ccf6e6d264dfbfd6bf9bcf336e90256d.zip
Use canonical mappings for file controls. Fixes W2KSP2 profile problems (I
think....). Jeremy. (This used to be commit 946cf3a0d7685e28af847b958ac01739335ea6e4)
-rw-r--r--source3/include/smb.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 7881334df8..2036076b6b 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1105,6 +1105,16 @@ struct bitmap {
FILE_EXECUTE|SYNCHRONIZE_ACCESS)
/* Mapping of access rights to UNIX perms. */
+#define UNIX_ACCESS_RWX FILE_GENERIC_ALL
+#define UNIX_ACCESS_R FILE_GENERIC_READ
+#define UNIX_ACCESS_W FILE_GENERIC_WRITE
+#define UNIX_ACCESS_X FILE_GENERIC_EXECUTE
+
+#if 0
+/*
+ * This is the old mapping we used to use. To get W2KSP2 profiles
+ * working we need to map to the canonical file perms.
+ */
#define UNIX_ACCESS_RWX (UNIX_ACCESS_R|UNIX_ACCESS_W|UNIX_ACCESS_X)
#define UNIX_ACCESS_R (READ_CONTROL_ACCESS|SYNCHRONIZE_ACCESS|\
FILE_READ_ATTRIBUTES|FILE_READ_EA|FILE_READ_DATA)
@@ -1113,6 +1123,7 @@ struct bitmap {
FILE_APPEND_DATA|FILE_WRITE_DATA)
#define UNIX_ACCESS_X (READ_CONTROL_ACCESS|SYNCHRONIZE_ACCESS|\
FILE_EXECUTE|FILE_READ_ATTRIBUTES)
+#endif
#define UNIX_ACCESS_NONE (WRITE_OWNER_ACCESS)