summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f02fc9a152..8aa1633735 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -7224,7 +7224,8 @@ NTSTATUS smbd_do_locking(struct smb_request *req,
*
* Replacement for do_lock_spin(). JRA. */
- if (br_lck && lp_blocking_locks(SNUM(conn)) &&
+ if (!smbd_server_conn->allow_smb2 &&
+ br_lck && lp_blocking_locks(SNUM(conn)) &&
lp_lock_spin_time() && !blocking_lock &&
NT_STATUS_EQUAL((status),
NT_STATUS_FILE_LOCK_CONFLICT))