1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00

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

obey blocking/non-blocking request for POSIX locks.
Jeremy.
This commit is contained in:
Jeremy Allison 2006-07-12 19:13:00 +00:00 committed by Gerald (Jerry) Carter
parent edd72d37de
commit f62c01316e

View File

@ -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