sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3:smbd: let construct_reply() also use smb_request_done()

Browse Source 
This way it matches the code path in construct_reply_chain().

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-06-11 08:34:05 +02:00 committed by Michael Adam
parent 4c9c53f5e4
commit 95bd792860
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/smbd/process.c
View File

@ -1644,7 +1644,6 @@ static void construct_reply(struct smbd_server_connection *sconn,
struct smb_perfcount_data *deferred_pcd)
{
struct smbXsrv_connection *xconn = sconn->conn;
connection_struct *conn;
struct smb_request *req;
if (!(req = talloc(talloc_tos(), struct smb_request))) {
@ -1667,27 +1666,19 @@ static void construct_reply(struct smbd_server_connection *sconn,
SMB_PERFCOUNT_SET_MSGLEN_IN(&req->pcd, size);
}
conn = switch_message(req->cmd, req);
req->conn = switch_message(req->cmd, req);
if (req->outbuf == NULL) {
/*
* Request has suspended itself, will come
* back here.
*/
return;
}
if (CVAL(req->outbuf,0) == 0) {
show_msg((char *)req->outbuf);
}
if (!srv_send_smb(req->sconn,
(char *)req->outbuf,
true, req->seqnum+1,
IS_CONN_ENCRYPTED(conn)||req->encrypted,
&req->pcd)) {
exit_server_cleanly("construct_reply: srv_send_smb failed.");
}
TALLOC_FREE(req);
return;
smb_request_done(req);
}
static void construct_reply_chain(struct smbd_server_connection *sconn,