diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-02-25 17:48:13 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-02-26 09:32:56 +0100 |
| commit | 7264a8b7ca5f91120dbc30fcbe8e8402f09ae883 (patch) | |
| tree | 329fcc47adcc0e15dc801b3c594265cc890a5632 /source4/ntvfs/common/opendb_tdb.c | |
| parent | 9852e0d31582f669179c2a8c8ebdb263fef611f2 (diff) | |
| download | samba-7264a8b7ca5f91120dbc30fcbe8e8402f09ae883.tar.gz samba-7264a8b7ca5f91120dbc30fcbe8e8402f09ae883.tar.bz2 samba-7264a8b7ca5f91120dbc30fcbe8e8402f09ae883.zip | |
opendb: unify the parameters of odb_open_file() and odb_can_open()
metze
(This used to be commit e6b708a52b0eada3fd374b66292ded3b0f6ce217)
Diffstat (limited to 'source4/ntvfs/common/opendb_tdb.c')
| -rw-r--r-- | source4/ntvfs/common/opendb_tdb.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c index d41a5c371e..73c04b7c4f 100644 --- a/source4/ntvfs/common/opendb_tdb.c +++ b/source4/ntvfs/common/opendb_tdb.c @@ -742,16 +742,13 @@ static NTSTATUS odb_tdb_get_delete_on_close(struct odb_context *odb, create_options and access_mask */ static NTSTATUS odb_tdb_can_open(struct odb_lock *lck, - uint32_t share_access, uint32_t create_options, - uint32_t access_mask) + uint32_t stream_id, uint32_t share_access, + uint32_t access_mask, bool delete_on_close, + uint32_t open_disposition, bool break_to_none) { struct odb_context *odb = lck->odb; NTSTATUS status; struct opendb_file file; - uint32_t stream_id = 0; - uint32_t open_disposition = 0; - bool delete_on_close = false; - bool break_to_none = false; bool attrs_only = false; status = odb_pull_record(lck, &file); @@ -760,10 +757,6 @@ static NTSTATUS odb_tdb_can_open(struct odb_lock *lck, } NT_STATUS_NOT_OK_RETURN(status); - if (create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) { - delete_on_close = true; - } - status = odb_tdb_open_can_internal(odb, &file, stream_id, share_access, access_mask, delete_on_close, open_disposition, |