diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-07 23:02:36 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-07 23:02:36 +0100 |
commit | 87abb775ce9a7610341ff8f06d1c482e72e6fd6d (patch) | |
tree | 6d74ffa4dbc967cd0f05a7182ca78f78d54dafdb /source4/ntvfs/common/opendb.c | |
parent | 6a1f56d82a367a2f037e18ed346cf7cce7f377e0 (diff) | |
parent | db669e1eb13effb08b1111405587c8c6dde95954 (diff) | |
download | samba-87abb775ce9a7610341ff8f06d1c482e72e6fd6d.tar.gz samba-87abb775ce9a7610341ff8f06d1c482e72e6fd6d.tar.bz2 samba-87abb775ce9a7610341ff8f06d1c482e72e6fd6d.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit ac27a1451dfe5c0c957e93fdc84602c3c1c7deac)
Diffstat (limited to 'source4/ntvfs/common/opendb.c')
-rw-r--r-- | source4/ntvfs/common/opendb.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c index a7e5458aaf..1cc077137c 100644 --- a/source4/ntvfs/common/opendb.c +++ b/source4/ntvfs/common/opendb.c @@ -87,23 +87,21 @@ _PUBLIC_ DATA_BLOB odb_get_key(TALLOC_CTX *mem_ctx, struct odb_lock *lck) } /* - register an open file in the open files database. This implements the share_access - rules + register an open file in the open files database. + The share_access rules are implemented by odb_can_open() + and it's needed to call odb_can_open() before + odb_open_file() otherwise NT_STATUS_INTERNAL_ERROR is returned Note that the path is only used by the delete on close logic, not for comparing with other filenames */ _PUBLIC_ NTSTATUS odb_open_file(struct odb_lock *lck, void *file_handle, const char *path, - uint32_t stream_id, uint32_t share_access, - uint32_t access_mask, bool delete_on_close, - uint32_t open_disposition, bool break_to_none, bool allow_level_II_oplock, uint32_t oplock_level, uint32_t *oplock_granted) { - return ops->odb_open_file(lck, file_handle, path, stream_id, share_access, - access_mask, delete_on_close, open_disposition, - break_to_none, allow_level_II_oplock, + return ops->odb_open_file(lck, file_handle, path, + allow_level_II_oplock, oplock_level, oplock_granted); } |