summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-08-19 16:34:50 +0200
committerStefan Metzmacher <metze@samba.org>2008-08-20 15:50:26 +0200
commiteb8dd6a81181c3dab9cbe6b934ceb4f3ba1ba2af (patch)
tree4a3fa4fb1e04f8cebef9c72428aa7d190fa8be57 /source3/include
parentb02746346112c94a7f20ac1cebc43b7aee6976e3 (diff)
downloadsamba-eb8dd6a81181c3dab9cbe6b934ceb4f3ba1ba2af.tar.gz
samba-eb8dd6a81181c3dab9cbe6b934ceb4f3ba1ba2af.tar.bz2
samba-eb8dd6a81181c3dab9cbe6b934ceb4f3ba1ba2af.zip
smbd: fix the handling of create_options to pass RAW-OPEN
Some of the bits generate INVALID_PARAMETER and some bits are ignored when they come from a client, that's why we need to use bits from the ignored range for our internal usage. metze (This used to be commit 7b4c8a4e39f310eb450918fa841b0ea1b4af19f7)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/smb.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index b8ff34f831..c8c4f8c3cc 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1330,12 +1330,19 @@ struct bitmap {
#define FILE_DELETE_ON_CLOSE 0x1000
#define FILE_OPEN_BY_FILE_ID 0x2000
-/* Private create options used by the ntcreatex processing code. From Samba4. */
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x01000000
-#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x02000000
+#define NTCREATEX_OPTIONS_MUST_IGNORE_MASK (0x008F0480)
+
+#define NTCREATEX_OPTIONS_INVALID_PARAM_MASK (0xFF100030)
+
+/*
+ * Private create options used by the ntcreatex processing code. From Samba4.
+ * We reuse some ignored flags for private use.
+ */
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_DOS 0x00010000
+#define NTCREATEX_OPTIONS_PRIVATE_DENY_FCB 0x00020000
/* Private options for streams support */
-#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x04000000
+#define NTCREATEX_OPTIONS_PRIVATE_STREAM_DELETE 0x00040000
/* Responses when opening a file. */
#define FILE_WAS_SUPERSEDED 0