diff options
| author | Jeremy Allison <jra@samba.org> | 2006-07-17 21:24:56 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:11 -0500 |
| commit | 8d6c41a75a762a370835c9cc06500f0f3c1d15e3 (patch) | |
| tree | 1e6c19d750d8839ae541287a7048042006d3988d /source3/smbd | |
| parent | e1da1fcf12164f50f3462c90f0bb785d18c59b0b (diff) | |
| download | samba-8d6c41a75a762a370835c9cc06500f0f3c1d15e3.tar.gz samba-8d6c41a75a762a370835c9cc06500f0f3c1d15e3.tar.bz2 samba-8d6c41a75a762a370835c9cc06500f0f3c1d15e3.zip | |
r17100: Ooops. Fix the build...
Jeremy.
(This used to be commit b21ca265a25b3d1e4f154ce0ee4b8757b41cf910)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/trans2.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 329d5bb0a5..199204684f 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -4503,7 +4503,7 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n", SMB_BIG_UINT count; SMB_BIG_UINT offset; uint32 lock_pid; - BOOL lock_blocking; + BOOL lock_blocking = False; enum brl_type lock_type; if (fsp == NULL || fsp->fh->fd == -1) { @@ -4540,6 +4540,10 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n", return ERROR_NT(NT_STATUS_INVALID_PARAMETER); } + if (!lp_blocking_locks(SNUM(conn))) { + lock_blocking = False; + } + lock_pid = IVAL(pdata, POSIX_LOCK_PID_OFFSET); #if defined(HAVE_LONGLONG) offset = (((SMB_BIG_UINT) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) | @@ -4563,9 +4567,10 @@ size = %.0f, uid = %u, gid = %u, raw perms = 0%o\n", count, offset, lock_type, + lock_blocking ? -1 : 0, POSIX_LOCK); - if (lock_blocking && lp_blocking_locks(SNUM(conn)) && ERROR_WAS_LOCK_DENIED(status)) { + if (lock_blocking && ERROR_WAS_LOCK_DENIED(status)) { /* * A blocking lock was requested. Package up * this smb into a queued request and push it |