diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-21 19:26:25 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-21 20:49:17 +0100 |
| commit | f7b4151a64d8c6851e62255a7139fd00a5fc63a3 (patch) | |
| tree | 9e6f78c5771207fff61519f92aafe69e8bd32a91 /source3/modules | |
| parent | 1e22899d268ae5a089f941a204413c07ee64fc78 (diff) | |
| download | samba-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/modules')
| -rw-r--r-- | source3/modules/onefs_open.c | 3 | ||||
| -rw-r--r-- | source3/modules/vfs_preopen.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index fd12fff58c..0d786f1556 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -603,7 +603,8 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn, /* Ignore 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; } diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c index e545901035..d91a031227 100644 --- a/source3/modules/vfs_preopen.c +++ b/source3/modules/vfs_preopen.c @@ -395,7 +395,8 @@ static int preopen_open(vfs_handle_struct *handle, return res; } - if (!is_in_path(smb_fname->base_name, state->preopen_names, true)) { + if (!is_in_path(smb_fname->base_name, state->preopen_names, + get_Protocol(), true)) { DEBUG(10, ("%s does not match the preopen:names list\n", smb_fname_str_dbg(smb_fname))); return res; |