r16990: Fix bug #3921 spotted by jason@ncac.gwu.edu. Correctly

obey blocking/non-blocking request for POSIX locks.
Jeremy.
(This used to be commit f62c01316ef3ce0351f8b34229307a75d8f9f156)

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index aca1fcd70e9aaab8f68ddd0dc4bc6957a3ce25cf..43437469d7e5277219e76df183c38ac6365549a2 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -4567,7 +4567,7 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n",
                                                POSIX_LOCK,
                                                &my_lock_ctx);
 
-                               if (lp_blocking_locks(SNUM(conn)) && ERROR_WAS_LOCK_DENIED(status)) {
+                               if (lock_blocking && lp_blocking_locks(SNUM(conn)) && ERROR_WAS_LOCK_DENIED(status)) {
                                        /*
                                         * A blocking lock was requested. Package up
                                         * this smb into a queued request and push it