summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-12 19:13:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:19:16 -0500
commit67854e8439d58af7f647dd97d9d4f2912a30265b (patch)
tree1a9fc768a71060b47d82536dd4c1b00e109644e3 /source3
parent17222261895b8c82eb5458bc66dab6712930d5a3 (diff)
downloadsamba-67854e8439d58af7f647dd97d9d4f2912a30265b.tar.gz
samba-67854e8439d58af7f647dd97d9d4f2912a30265b.tar.bz2
samba-67854e8439d58af7f647dd97d9d4f2912a30265b.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/trans2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index aca1fcd70e..43437469d7 100644
--- 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