summaryrefslogtreecommitdiffstats
path: root/source3/smbd/files.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-06-11 14:25:07 +0200
committerMichael Adam <obnox@samba.org>2014-08-06 09:51:13 +0200
commitd799fb360ac5c466eb5ae00ce0687e0bb6ebba56 (patch)
treecea338909c1c438fbed0bf3ea47e18532ff8b3b9 /source3/smbd/files.c
parent967ff180f7b784d62282cd8f4c9987d5b8ae8956 (diff)
downloadsamba-d799fb360ac5c466eb5ae00ce0687e0bb6ebba56.tar.gz
samba-d799fb360ac5c466eb5ae00ce0687e0bb6ebba56.tar.xz
samba-d799fb360ac5c466eb5ae00ce0687e0bb6ebba56.zip
s3:smbd: use req->xconn in files.c
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/smbd/files.c')
-rw-r--r--source3/smbd/files.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 2a0f6cebc0..a9e8357cf3 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -94,10 +94,11 @@ NTSTATUS file_new(struct smb_request *req, connection_struct *conn,
GetTimeOfDay(&fsp->open_time);
if (req) {
+ struct smbXsrv_connection *xconn = req->xconn;
struct smbXsrv_open *op = NULL;
NTTIME now = timeval_to_nttime(&fsp->open_time);
- status = smbXsrv_open_create(sconn->conn,
+ status = smbXsrv_open_create(xconn,
conn->session_info,
now, &op);
if (!NT_STATUS_IS_OK(status)) {
@@ -558,13 +559,13 @@ files_struct *file_fsp(struct smb_request *req, uint16 fid)
return req->chain_fsp;
}
- if (req->sconn->conn == NULL) {
+ if (req->xconn == NULL) {
return NULL;
}
now = timeval_to_nttime(&req->request_time);
- status = smb1srv_open_lookup(req->sconn->conn,
+ status = smb1srv_open_lookup(req->xconn,
fid, now, &op);
if (!NT_STATUS_IS_OK(status)) {
return NULL;
@@ -594,7 +595,7 @@ struct files_struct *file_fsp_get(struct smbd_smb2_request *smb2req,
now = timeval_to_nttime(&smb2req->request_time);
- status = smb2srv_open_lookup(smb2req->sconn->conn,
+ status = smb2srv_open_lookup(smb2req->xconn,
persistent_id, volatile_id,
now, &op);
if (!NT_STATUS_IS_OK(status)) {