diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-15 21:16:40 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-15 21:16:40 +1000 |
| commit | 489525a6390e50bd0442295ac45164f43a7576c8 (patch) | |
| tree | 44a8715d7359c2efcc482f87bea82dd92bd080de /source4/ntvfs/ntvfs_generic.c | |
| parent | cd261ee651d3059f6973464115ff43da71d8a595 (diff) | |
| parent | 4bdb752cc51c9f41859f1a43bf5721ae616fa230 (diff) | |
| download | samba-489525a6390e50bd0442295ac45164f43a7576c8.tar.gz samba-489525a6390e50bd0442295ac45164f43a7576c8.tar.bz2 samba-489525a6390e50bd0442295ac45164f43a7576c8.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit fa03d750e4577a610dc410d45d49789110b1b4f1)
Diffstat (limited to 'source4/ntvfs/ntvfs_generic.c')
| -rw-r--r-- | source4/ntvfs/ntvfs_generic.c | 10 |
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; |