summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-07-12 21:57:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:19:17 -0500
commit75a2f4dbc895f4f43564941a8478257f4e75ea22 (patch)
tree58fe0ac239bb30bf14900c534ef45227441e69ac /source3
parent23afde616dc611bc525cb17838b3cfc72eb2a8f3 (diff)
downloadsamba-75a2f4dbc895f4f43564941a8478257f4e75ea22.tar.gz
samba-75a2f4dbc895f4f43564941a8478257f4e75ea22.tar.bz2
samba-75a2f4dbc895f4f43564941a8478257f4e75ea22.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/locking/posix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index 9d5c42a1bc..9a50f55c09 100644
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -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,