From e7d1e9a9b68d3bd7ad7328ed7dda6735eba025ae Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 10 Oct 2003 01:53:38 +0000 Subject: Make us pass Samba4 lock tester (with one different error message). Jeremy. (This used to be commit 7622a9dbbded8d07f976ec965adca5e92de3d2b0) --- source3/smbd/reply.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/smbd/reply.c') diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 89bb5eeb94..ec63be32b4 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -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); } -- cgit