diff options
| author | Jeremy Allison <jra@samba.org> | 2006-07-12 19:13:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:19:16 -0500 |
| commit | f62c01316ef3ce0351f8b34229307a75d8f9f156 (patch) | |
| tree | 164cd6fe73c0c4b4375010a92fee5580031baff9 /source | |
| parent | edd72d37de570fdad09f7ee983b5b22a1613e558 (diff) | |
| download | samba-f62c01316ef3ce0351f8b34229307a75d8f9f156.tar.gz samba-f62c01316ef3ce0351f8b34229307a75d8f9f156.tar.xz samba-f62c01316ef3ce0351f8b34229307a75d8f9f156.zip | |
r16990: Fix bug #3921 spotted by jason@ncac.gwu.edu. Correctly
obey blocking/non-blocking request for POSIX locks.
Jeremy.
Diffstat (limited to 'source')
| -rw-r--r-- | source/smbd/trans2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c index aca1fcd70e9..43437469d7e 100644 --- a/source/smbd/trans2.c +++ b/source/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 |