sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

the lock routines now take a enumerated type for read/write locks, and

Browse Source 
we now don't pass the lock type at all for unlocks.

I was surprised to discover that NT totally ignores the lock type in
unlocks. It unlocks a matching write lock if there is one, otherwise
it removes the first matching read lock.
(This used to be commit 1bbc1ce18b8ccb92b5a78ee648539a591a452118)
This commit is contained in:
Andrew Tridgell 2000-01-13 12:08:53 +00:00
parent 415e3c0cec
commit 6bad53f758
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/libsmb/clientgen.c
View File

@ -1345,7 +1345,7 @@ BOOL cli_close(struct cli_state *cli, int fnum)
lock a file
****************************************************************************/
BOOL cli_lock(struct cli_state *cli, int fnum,
uint32 offset, uint32 len, int timeout, int locktype)
uint32 offset, uint32 len, int timeout, enum lock_type lock_type)
{
char *p;
int saved_timeout = cli->timeout;
@ -1361,7 +1361,7 @@ BOOL cli_lock(struct cli_state *cli, int fnum,
CVAL(cli->outbuf,smb_vwv0) = 0xFF;
SSVAL(cli->outbuf,smb_vwv2,fnum);
CVAL(cli->outbuf,smb_vwv3) = (locktype == F_RDLCK? 1 : 0);
CVAL(cli->outbuf,smb_vwv3) = (lock_type == READ_LOCK? 1 : 0);
SIVALS(cli->outbuf, smb_vwv4, timeout);
SSVAL(cli->outbuf,smb_vwv6,0);
SSVAL(cli->outbuf,smb_vwv7,1);
@ -1392,7 +1392,7 @@ BOOL cli_lock(struct cli_state *cli, int fnum,
unlock a file
****************************************************************************/
BOOL cli_unlock(struct cli_state *cli, int fnum,
uint32 offset, uint32 len, int timeout, int locktype)
uint32 offset, uint32 len, int timeout)
{
char *p;
@ -1407,7 +1407,7 @@ BOOL cli_unlock(struct cli_state *cli, int fnum,
CVAL(cli->outbuf,smb_vwv0) = 0xFF;
SSVAL(cli->outbuf,smb_vwv2,fnum);
CVAL(cli->outbuf,smb_vwv3) = (locktype == F_RDLCK? 1 : 0);
CVAL(cli->outbuf,smb_vwv3) = 0;
SIVALS(cli->outbuf, smb_vwv4, timeout);
SSVAL(cli->outbuf,smb_vwv6,1);
SSVAL(cli->outbuf,smb_vwv7,0);