summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-10-10 01:53:35 +0000
committerJeremy Allison <jra@samba.org>2003-10-10 01:53:35 +0000
commit9610df161326a378f73fbb9f829f07a3f8e48627 (patch)
tree0a9cc0e1796f4f73513cce99a82c7fa3c8917757 /source3
parent63e99b0a33a9deeb33de4ea9af241d627d3fc5be (diff)
downloadsamba-9610df161326a378f73fbb9f829f07a3f8e48627.tar.gz
samba-9610df161326a378f73fbb9f829f07a3f8e48627.tar.bz2
samba-9610df161326a378f73fbb9f829f07a3f8e48627.zip
Make us pass Samba4 lock tester (with one different error message).
Jeremy. (This used to be commit 1c19739aeada047eeb6bc7dbec161b5d783a3576)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c3
1 files changed, 3 insertions, 0 deletions
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);
}