s3:smbd: pass smbXsrv_connection to srv_send_smb()

[samba.git] / source3 / smbd / ipc.c

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 9a07ba01115130e436cec585b9dc592aa6380c60..6f4c7e0f11c3d35d8c241e68bfda46178a58262d 100644 (file)
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -108,7 +108,6 @@ void send_trans_reply(connection_struct *conn,
        int ldata  = rdata  ? rdata_len : 0;
        int lparam = rparam ? rparam_len : 0;
        struct smbXsrv_connection *xconn = req->xconn;
-       struct smbd_server_connection *sconn = xconn->sconn;
        int max_send = xconn->smb1.sessions.max_send;
        /* HACK: make sure we send at least 128 byte in one go */
        int hdr_overhead = SMB_BUFFER_SIZE_MIN - 128;
@@ -152,7 +151,7 @@ void send_trans_reply(connection_struct *conn,
        }
 
        show_msg((char *)req->outbuf);
-       if (!srv_send_smb(sconn, (char *)req->outbuf,
+       if (!srv_send_smb(xconn, (char *)req->outbuf,
                          true, req->seqnum+1,
                          IS_CONN_ENCRYPTED(conn), &req->pcd)) {
                exit_server_cleanly("send_trans_reply: srv_send_smb failed.");
@@ -212,7 +211,7 @@ void send_trans_reply(connection_struct *conn,
                }
 
                show_msg((char *)req->outbuf);
-               if (!srv_send_smb(sconn, (char *)req->outbuf,
+               if (!srv_send_smb(xconn, (char *)req->outbuf,
                                  true, req->seqnum+1,
                                  IS_CONN_ENCRYPTED(conn), &req->pcd))
                        exit_server_cleanly("send_trans_reply: srv_send_smb "
@@ -342,7 +341,7 @@ static void api_dcerpc_cmd_write_done(struct tevent_req *subreq)
 
  send:
        if (!srv_send_smb(
-                   req->sconn, (char *)req->outbuf,
+                   req->xconn, (char *)req->outbuf,
                    true, req->seqnum+1,
                    IS_CONN_ENCRYPTED(req->conn) || req->encrypted,
                    &req->pcd)) {
@@ -375,7 +374,7 @@ static void api_dcerpc_cmd_read_done(struct tevent_req *subreq)
                           NT_STATUS_EQUAL(old, status)?"":nt_errstr(status)));
                reply_nterror(req, status);
 
-               if (!srv_send_smb(req->sconn, (char *)req->outbuf,
+               if (!srv_send_smb(req->xconn, (char *)req->outbuf,
                                  true, req->seqnum+1,
                                  IS_CONN_ENCRYPTED(req->conn)
                                  ||req->encrypted, &req->pcd)) {