1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-14 01:57:53 +03:00

r17000: Allow CIFS POSIX locks to coexist with Windows locks.

We shouldn't allow this on the same smbd, but the cifsfs
client negotiates POSIX locks then sends Windows ones.
Doh ! Can't fix shipped client code....
Jeremy.
(This used to be commit 2f8cabe98d3776cb0bdf6b4ef1490fe0119e260a)
This commit is contained in:
Jeremy Allison 2006-07-12 21:57:54 +00:00 committed by Gerald (Jerry) Carter
parent 23afde616d
commit 75a2f4dbc8

@ -642,7 +642,7 @@ int fd_close_posix(struct connection_struct *conn, files_struct *fsp)
int *fd_array = NULL;
size_t count, i;
if (!lp_locking(SNUM(fsp->conn)) || !lp_posix_locking(SNUM(conn)) || lp_posix_cifsu_locktype()) {
if (!lp_locking(SNUM(fsp->conn)) || !lp_posix_locking(SNUM(conn))) {
/*
* No locking or POSIX to worry about or we want POSIX semantics
* which will lose all locks on all fd's open on this dev/inode,