diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-06-08 17:51:47 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-29 21:01:11 +0200 |
| commit | 7d1395536bbcc937e3115aa067eed3f69f3909be (patch) | |
| tree | b8c1b3a6ba1d84cb94d8fdf0b8a6f0a74d8c74f6 /source3/smbd/smb2_break.c | |
| parent | f7762e2730aa4e2fe37043b56e0413983b484108 (diff) | |
| download | samba-7d1395536bbcc937e3115aa067eed3f69f3909be.tar.gz samba-7d1395536bbcc937e3115aa067eed3f69f3909be.tar.bz2 samba-7d1395536bbcc937e3115aa067eed3f69f3909be.zip | |
s3:smbd: make use of smbXsrv_open for smb1/2/3
This makes sure we generate unique persistent file ids,
which are stored in smbXsrv_open_global.tdb.
Pair-Programmed-With: Michael Adam <obnox@samba.org>
metze
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Jun 29 21:01:11 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/smbd/smb2_break.c')
| -rw-r--r-- | source3/smbd/smb2_break.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c index 95e1d8b537..77f4709620 100644 --- a/source3/smbd/smb2_break.c +++ b/source3/smbd/smb2_break.c @@ -237,7 +237,6 @@ void send_break_message_smb2(files_struct *fsp, int level) SMB2_OPLOCK_LEVEL_II : SMB2_OPLOCK_LEVEL_NONE; NTSTATUS status; - uint64_t fsp_persistent = fsp_persistent_id(fsp); DEBUG(10,("send_break_message_smb2: sending oplock break " "for file %s, %s, smb2 level %u\n", @@ -246,8 +245,8 @@ void send_break_message_smb2(files_struct *fsp, int level) (unsigned int)smb2_oplock_level )); status = smbd_smb2_send_oplock_break(fsp->conn->sconn, - fsp_persistent, - fsp->fnum, + fsp->op->global->open_persistent_id, + fsp->op->global->open_volatile_id, smb2_oplock_level); if (!NT_STATUS_IS_OK(status)) { smbd_server_connection_terminate(fsp->conn->sconn, |