mirror of
https://github.com/samba-team/samba.git
synced 2025-01-29 21:47:30 +03:00
Make us pass Samba4 lock tester (with one different error message).
Jeremy. (This used to be commit 7622a9dbbded8d07f976ec965adca5e92de3d2b0)
This commit is contained in:
parent
a43a3ed460
commit
e7d1e9a9b6
@ -2691,6 +2691,8 @@ int reply_lock(connection_struct *conn,
|
||||
|
||||
status = do_lock_spin(fsp, conn, SVAL(inbuf,smb_pid), count, offset, WRITE_LOCK, &my_lock_ctx);
|
||||
if (NT_STATUS_V(status)) {
|
||||
#if 0
|
||||
/* Tests using Samba4 against W2K show this call never creates a blocking lock. */
|
||||
if (lp_blocking_locks(SNUM(conn)) && !my_lock_ctx && ERROR_WAS_LOCK_DENIED(status)) {
|
||||
/*
|
||||
* A blocking lock was requested. Package up
|
||||
@ -2702,6 +2704,7 @@ int reply_lock(connection_struct *conn,
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
END_PROFILE(SMBlock);
|
||||
return ERROR_NT(status);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user