summaryrefslogtreecommitdiff
path: root/source3/smbd/open.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-11-21 19:26:25 +0100
committerVolker Lendecke <vl@samba.org>2009-11-21 20:49:17 +0100
commitf7b4151a64d8c6851e62255a7139fd00a5fc63a3 (patch)
tree9e6f78c5771207fff61519f92aafe69e8bd32a91 /source3/smbd/open.c
parent1e22899d268ae5a089f941a204413c07ee64fc78 (diff)
downloadsamba-f7b4151a64d8c6851e62255a7139fd00a5fc63a3.tar.gz
samba-f7b4151a64d8c6851e62255a7139fd00a5fc63a3.tar.bz2
samba-f7b4151a64d8c6851e62255a7139fd00a5fc63a3.zip
s3: Make the implicit reference to Protocol in is_in_path() explicit
Diffstat (limited to 'source3/smbd/open.c')
-rw-r--r--source3/smbd/open.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 98984b8695..91cfa22a05 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -611,7 +611,7 @@ static NTSTATUS open_file(files_struct *fsp,
fsp->is_directory = False;
if (conn->aio_write_behind_list &&
is_in_path(smb_fname->base_name, conn->aio_write_behind_list,
- conn->case_sensitive)) {
+ get_Protocol(), conn->case_sensitive)) {
fsp->aio_write_behind = True;
}
status = fsp_set_smb_fname(fsp, smb_fname);
@@ -1570,7 +1570,8 @@ 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 ||
- IS_VETO_OPLOCK_PATH(conn, smb_fname->base_name)) {
+ is_in_path(smb_fname->base_name, conn->veto_oplock_list,
+ get_Protocol(), conn->case_sensitive)) {
/* Mask off everything except the private Samba bits. */
oplock_request &= SAMBA_PRIVATE_OPLOCK_MASK;
}