summaryrefslogtreecommitdiffstats
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
commit946cf3a0d7685e28af847b958ac01739335ea6e4 (patch)
treed8d3f7e1932df2648e4f1e97bda55386de3ac5cb
parent97a88ca86b1c39066ffcdad6e81d6422fad8341b (diff)
downloadsamba-946cf3a0d7685e28af847b958ac01739335ea6e4.tar.gz
samba-946cf3a0d7685e28af847b958ac01739335ea6e4.tar.xz
samba-946cf3a0d7685e28af847b958ac01739335ea6e4.zip
Use canonical mappings for file controls. Fixes W2KSP2 profile problems (I
think....). Jeremy.
-rw-r--r--source/include/smb.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/include/smb.h b/source/include/smb.h
index 7881334df8f..2036076b6b1 100644
--- a/source/include/smb.h
+++ b/source/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)