svn commit: samba r16990 - in branches/SAMBA_3_0/source/smbd: .
jra at samba.org
jra at samba.org
Wed Jul 12 19:13:00 GMT 2006
Author: jra
Date: 2006-07-12 19:13:00 +0000 (Wed, 12 Jul 2006)
New Revision: 16990
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16990
Log:
Fix bug #3921 spotted by jason at ncac.gwu.edu. Correctly
obey blocking/non-blocking request for POSIX locks.
Jeremy.
Modified:
branches/SAMBA_3_0/source/smbd/trans2.c
Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c 2006-07-12 17:14:32 UTC (rev 16989)
+++ branches/SAMBA_3_0/source/smbd/trans2.c 2006-07-12 19:13:00 UTC (rev 16990)
@@ -4567,7 +4567,7 @@
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
More information about the samba-cvs
mailing list