From 9aa1d259070e93b3890933c932cbf6a2c84bc6fa Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 7 Aug 2009 15:21:07 +0200 Subject: s3:smbd: rename conn => sconn for smbd_server_connection structs This should avoid confusion between smbd_server_connection and connection_struct variables. metze --- source3/smbd/smb2_lock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/smbd/smb2_lock.c') diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index 121b4eb24d..d515f18eda 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -113,7 +113,7 @@ NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req) } subreq = smbd_smb2_lock_send(req, - req->conn->smb2.event_ctx, + req->sconn->smb2.event_ctx, req, in_smbpid, in_file_id_volatile, @@ -144,7 +144,7 @@ static void smbd_smb2_request_lock_done(struct tevent_req *subreq) if (!NT_STATUS_IS_OK(status)) { error = smbd_smb2_request_error(req, status); if (!NT_STATUS_IS_OK(error)) { - smbd_server_connection_terminate(req->conn, + smbd_server_connection_terminate(req->sconn, nt_errstr(error)); return; } @@ -155,7 +155,7 @@ static void smbd_smb2_request_lock_done(struct tevent_req *subreq) if (outbody.data == NULL) { error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY); if (!NT_STATUS_IS_OK(error)) { - smbd_server_connection_terminate(req->conn, + smbd_server_connection_terminate(req->sconn, nt_errstr(error)); return; } @@ -167,7 +167,7 @@ static void smbd_smb2_request_lock_done(struct tevent_req *subreq) error = smbd_smb2_request_done(req, outbody, NULL); if (!NT_STATUS_IS_OK(error)) { - smbd_server_connection_terminate(req->conn, + smbd_server_connection_terminate(req->sconn, nt_errstr(error)); return; } -- cgit