From 08b24e923dff99d3d3c0618903a7ed2959640470 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 8 Apr 2010 22:15:55 -0700 Subject: Stop smb2 from calling into smb1 blocking lock request code. Allocate a uint16_t internal SMB1 mid for an SMB2 request. Add a back pointer from the faked up smb_request struct to the smb2 request. Getting ready to add restart code for blocking locks, share mode violations and oplocks in SMB2. Jeremy. --- source3/smbd/smb2_lock.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'source3/smbd/smb2_lock.c') diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index 908e1cf8a4..129bb2f330 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -381,3 +381,23 @@ static NTSTATUS smbd_smb2_lock_recv(struct tevent_req *req) tevent_req_received(req); return NT_STATUS_OK; } + +/* + * Dummy (for now) function to cope with SMB2 blocking lock + * requests. + */ + +bool smb2_push_blocking_lock_request( struct byte_range_lock *br_lck, + struct smb_request *req, + files_struct *fsp, + int lock_timeout, + int lock_num, + uint32_t lock_pid, + enum brl_type lock_type, + enum brl_flavour lock_flav, + uint64_t offset, + uint64_t count, + uint32_t blocking_pid) +{ + return false; +} -- cgit