diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:33:53 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:35:00 +0100 |
| commit | 5c4885a26bbdc1a5086417b63395debd2670db85 (patch) | |
| tree | ec042f16d03049bdbe7bb0f886cba6742d32b8d1 /source3/modules | |
| parent | 7930206f5c80b15aded213c3f438ff0120fdea2c (diff) | |
| download | samba-5c4885a26bbdc1a5086417b63395debd2670db85.tar.gz samba-5c4885a26bbdc1a5086417b63395debd2670db85.tar.bz2 samba-5c4885a26bbdc1a5086417b63395debd2670db85.zip | |
Revert "s3: Make the implicit reference to Protocol in is_in_path() explicit"
This reverts commit f7b4151a64d8c6851e62255a7139fd00a5fc63a3.
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, 2 insertions, 4 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index 0d786f1556..fd12fff58c 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -603,8 +603,7 @@ 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_in_path(smb_fname->base_name, conn->veto_oplock_list, - get_Protocol(), conn->case_sensitive)) { + IS_VETO_OPLOCK_PATH(conn, smb_fname->base_name)) { /* 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 d91a031227..e545901035 100644 --- a/source3/modules/vfs_preopen.c +++ b/source3/modules/vfs_preopen.c @@ -395,8 +395,7 @@ static int preopen_open(vfs_handle_struct *handle, return res; } - if (!is_in_path(smb_fname->base_name, state->preopen_names, - get_Protocol(), true)) { + if (!is_in_path(smb_fname->base_name, state->preopen_names, true)) { DEBUG(10, ("%s does not match the preopen:names list\n", smb_fname_str_dbg(smb_fname))); return res; |