summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-10-10 01:53:38 +0000
committerJeremy Allison <jra@samba.org>2003-10-10 01:53:38 +0000
commite7d1e9a9b68d3bd7ad7328ed7dda6735eba025ae (patch)
treee5dde509c8553805e7e1ae4f94e40ffae8fe3452
parenta43a3ed4606014b68ac0ec591f5923eebf949cc9 (diff)
downloadsamba-e7d1e9a9b68d3bd7ad7328ed7dda6735eba025ae.tar.gz
samba-e7d1e9a9b68d3bd7ad7328ed7dda6735eba025ae.tar.bz2
samba-e7d1e9a9b68d3bd7ad7328ed7dda6735eba025ae.zip
Make us pass Samba4 lock tester (with one different error message).
Jeremy. (This used to be commit 7622a9dbbded8d07f976ec965adca5e92de3d2b0)
-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);
}