summaryrefslogtreecommitdiff
path: root/source3/smbd/open.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-05-13 11:33:02 -0700
committerJeremy Allison <jra@samba.org>2010-05-13 11:33:02 -0700
commit895b99fd6bfb1a65c3ae408bdf381e66783ac385 (patch)
treeb953b9b2f3ceeac856e4630900f1ee08e67294ed /source3/smbd/open.c
parented6fa379ef6e1f5d7ca3d5c42e4e97a2c7604683 (diff)
downloadsamba-895b99fd6bfb1a65c3ae408bdf381e66783ac385.tar.gz
samba-895b99fd6bfb1a65c3ae408bdf381e66783ac385.tar.bz2
samba-895b99fd6bfb1a65c3ae408bdf381e66783ac385.zip
Be more forgiving on client oplock break failure (as Windows does). Remove a global.
Jeremy.
Diffstat (limited to 'source3/smbd/open.c')
-rw-r--r--source3/smbd/open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 049ce222ad..ce69157df5 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1593,7 +1593,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
}
/* ignore any oplock requests if oplocks are disabled */
- if (!lp_oplocks(SNUM(conn)) || global_client_failed_oplock_break ||
+ if (!lp_oplocks(SNUM(conn)) ||
IS_VETO_OPLOCK_PATH(conn, smb_fname->base_name)) {
/* Mask off everything except the private Samba bits. */
oplock_request &= SAMBA_PRIVATE_OPLOCK_MASK;