diff options
| author | Volker Lendecke <vl@samba.org> | 2009-11-23 16:33:26 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-11-23 16:34:59 +0100 |
| commit | 0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6 (patch) | |
| tree | 5ac6a5d6276f2645e0d4f2ae89c92420bd66985f /source3/smbd/open.c | |
| parent | 81c46686db36eaffd25c013f19094b01a8406c6a (diff) | |
| download | samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.gz samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.tar.bz2 samba-0f8e2a6ebb716588e741c2cdd8e9918262fdd4c6.zip | |
Revert "s3: Move the global variable Protocol to struct smbd_server_connection"
This reverts commit c85a4c9ba4a7de65a7850f6f9708df66bd24deea.
Diffstat (limited to 'source3/smbd/open.c')
| -rw-r--r-- | source3/smbd/open.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index f8e1927bd4..3ae6a8af29 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->sconn), conn->case_sensitive)) { + get_Protocol(), conn->case_sensitive)) { fsp->aio_write_behind = True; } status = fsp_set_smb_fname(fsp, smb_fname); @@ -1570,7 +1570,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->sconn), conn->case_sensitive)) { + get_Protocol(), conn->case_sensitive)) { /* Mask off everything except the private Samba bits. */ oplock_request &= SAMBA_PRIVATE_OPLOCK_MASK; } |