diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-07 07:38:44 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-07 07:38:44 +1100 |
| commit | 449c0c52428e79ffcaa520c590df468b10397fb3 (patch) | |
| tree | eaf0e4ad65284ffe72194d11e1a970da251eea2d /source4/ntvfs/common/opendb.c | |
| parent | 8b24d248b7c928fd3b20f95ede34302ca274c4ae (diff) | |
| parent | 7eaa6b5f9a316d658c3ecf98b44a4cdf8a2de512 (diff) | |
| download | samba-449c0c52428e79ffcaa520c590df468b10397fb3.tar.gz samba-449c0c52428e79ffcaa520c590df468b10397fb3.tar.bz2 samba-449c0c52428e79ffcaa520c590df468b10397fb3.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit a6997c333cdd68dfba8a069df448836ff487787f)
Diffstat (limited to 'source4/ntvfs/common/opendb.c')
| -rw-r--r-- | source4/ntvfs/common/opendb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c index 6c1a9c070a..a7e5458aaf 100644 --- a/source4/ntvfs/common/opendb.c +++ b/source4/ntvfs/common/opendb.c @@ -98,11 +98,13 @@ _PUBLIC_ NTSTATUS odb_open_file(struct odb_lock *lck, 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, oplock_level, oplock_granted); + break_to_none, allow_level_II_oplock, + oplock_level, oplock_granted); } |