diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-06-11 12:55:24 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-09-19 09:15:11 +0200 |
| commit | 4b9f17eca73120a1741250d2d55382921e4dea3c (patch) | |
| tree | cefcc5b01de66489872bf60b1c43762d056026d7 /source3/smbd/reply.c | |
| parent | e3ab0a0569db3a63a05deae1c372b88eabf2bea2 (diff) | |
| download | samba-4b9f17eca73120a1741250d2d55382921e4dea3c.tar.gz samba-4b9f17eca73120a1741250d2d55382921e4dea3c.tar.xz samba-4b9f17eca73120a1741250d2d55382921e4dea3c.zip | |
s3:smbd: pass smbXsrv_connection to srv_send_smb()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 3c22bbb09a..5a74275324 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -431,7 +431,6 @@ bool check_fsp_ntquota_handle(connection_struct *conn, struct smb_request *req, static bool netbios_session_retarget(struct smbXsrv_connection *xconn, const char *name, int name_type) { - struct smbd_server_connection *sconn = xconn->sconn; char *trim_name; char *trim_name_type; const char *retarget_parm; @@ -509,7 +508,7 @@ static bool netbios_session_retarget(struct smbXsrv_connection *xconn, *(uint32_t *)(outbuf+4) = in_addr->sin_addr.s_addr; *(uint16_t *)(outbuf+8) = htons(retarget_port); - if (!srv_send_smb(sconn, (char *)outbuf, false, 0, false, + if (!srv_send_smb(xconn, (char *)outbuf, false, 0, false, NULL)) { exit_server_cleanly("netbios_session_retarget: srv_send_smb " "failed."); @@ -668,7 +667,7 @@ void reply_special(struct smbXsrv_connection *xconn, char *inbuf, size_t inbuf_s DEBUG(5,("init msg_type=0x%x msg_flags=0x%x\n", msg_type, msg_flags)); - srv_send_smb(sconn, outbuf, false, 0, false, NULL); + srv_send_smb(xconn, outbuf, false, 0, false, NULL); if (CVAL(outbuf, 0) != 0x82) { exit_server_cleanly("invalid netbios session"); @@ -4334,7 +4333,7 @@ void reply_writebraw(struct smb_request *req) SCVAL(buf,smb_com,SMBwritebraw); SSVALS(buf,smb_vwv0,0xFFFF); show_msg(buf); - if (!srv_send_smb(req->sconn, + if (!srv_send_smb(req->xconn, buf, false, 0, /* no signing */ IS_CONN_ENCRYPTED(conn), @@ -5248,7 +5247,7 @@ static void do_smb1_close(struct tevent_req *req) } else { reply_nterror(smbreq, status); } - if (!srv_send_smb(smbreq->sconn, + if (!srv_send_smb(smbreq->xconn, (char *)smbreq->outbuf, true, smbreq->seqnum+1, @@ -5569,7 +5568,7 @@ void reply_echo(struct smb_request *req) SSVAL(req->outbuf,smb_vwv0,seq_num); show_msg((char *)req->outbuf); - if (!srv_send_smb(req->sconn, + if (!srv_send_smb(req->xconn, (char *)req->outbuf, true, req->seqnum+1, IS_CONN_ENCRYPTED(conn)||req->encrypted, |