sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r17100: Ooops. Fix the build...

Browse Source 
Jeremy.
(This used to be commit b21ca265a2)
This commit is contained in:
Jeremy Allison 2006-07-17 21:24:56 +00:00 committed by Gerald (Jerry) Carter
parent e1da1fcf12
commit 8d6c41a75a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/smbd/trans2.c
View File

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