diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-08-15 07:58:03 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-08-15 07:58:03 +1000 |
| commit | ac503b140d6d69b6341be2e80ba535d7cfc7a73d (patch) | |
| tree | 8bf3d874f09486b71fb0d2faaf37d4cd5cc3d00a /source4/ntvfs/ntvfs_generic.c | |
| parent | cb98944be3fd24a9ee9c7b4cef3732e68a8c1627 (diff) | |
| parent | c1c6c1b609ab57186dab7b13c56bfe4475a733f7 (diff) | |
| download | samba-ac503b140d6d69b6341be2e80ba535d7cfc7a73d.tar.gz samba-ac503b140d6d69b6341be2e80ba535d7cfc7a73d.tar.xz samba-ac503b140d6d69b6341be2e80ba535d7cfc7a73d.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit b337369d5c86b37d93ee1c62880068e14d6c09f6)
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; |