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/smbd/open.c | |
| 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/smbd/open.c')
| -rw-r--r-- | source3/smbd/open.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 3ae6a8af29..911e8fde68 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, - get_Protocol(), conn->case_sensitive)) { + conn->case_sensitive)) { fsp->aio_write_behind = True; } status = fsp_set_smb_fname(fsp, smb_fname); @@ -1569,8 +1569,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 || - 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; } |