summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-08-14 09:52:45 +0200
committerStefan Metzmacher <metze@samba.org>2008-08-14 13:13:51 +0200
commit548ed8d9586bbf9504bec5064a14893f5827b0e4 (patch)
tree8e65d6ca5f4761ae3c8d29ce31df88dcb660628f /source4/ntvfs
parent2a336a63d704b1a5cf8e9a2961f48285081256ac (diff)
downloadsamba-548ed8d9586bbf9504bec5064a14893f5827b0e4.tar.gz
samba-548ed8d9586bbf9504bec5064a14893f5827b0e4.tar.bz2
samba-548ed8d9586bbf9504bec5064a14893f5827b0e4.zip
ntvfs_generic: fix handling of create_options for SMB2
metze (This used to be commit cbd585d2a1e179615eba773cb07385524369c686)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/ntvfs_generic.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 4f3a7e2198..c34bb7125e 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -532,16 +532,14 @@ NTSTATUS ntvfs_map_open(struct ntvfs_module_context *ntvfs,
}
/* we need to check these bits before we check the private mask */
- if (io2->generic.in.create_options & NTCREATEX_OPTIONS_NOT_SUPPORTED_MASK) {
+ if (io2->generic.in.create_options & SMB2_CREATE_OPTIONS_NOT_SUPPORTED_MASK) {
status = NT_STATUS_NOT_SUPPORTED;
break;
}
- /* we use a couple of bits of the create options internally */
- if (io2->generic.in.create_options & NTCREATEX_OPTIONS_PRIVATE_MASK) {
- status = NT_STATUS_INVALID_PARAMETER;
- break;
- }
+ /* TODO: find out why only SMB2 ignores these */
+ io2->generic.in.create_options &= ~NTCREATEX_OPTIONS_SYNC_ALERT;
+ io2->generic.in.create_options &= ~NTCREATEX_OPTIONS_ASYNC_ALERT;
status = ntvfs->ops->open(ntvfs, req, io2);
break;