diff options
| author | Volker Lendecke <vl@samba.org> | 2008-11-07 20:38:05 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-11-08 10:42:29 +0100 |
| commit | 8315677ca3ca9eed62fe6e24bac333b9b5dc763b (patch) | |
| tree | 30e4ffbeaf08b1b0290c18c37caf9f993abbd45b /source3/smbd/ipc.c | |
| parent | 7a35506bb87fd784a4a7a5b81c2d2ab5c32b233b (diff) | |
| download | samba-8315677ca3ca9eed62fe6e24bac333b9b5dc763b.tar.gz samba-8315677ca3ca9eed62fe6e24bac333b9b5dc763b.tar.bz2 samba-8315677ca3ca9eed62fe6e24bac333b9b5dc763b.zip | |
Do not write into inbuf for the transs request
Instead, fix up the outbuf in send_xx_reply. In those routines, we know
what we are returning.
Diffstat (limited to 'source3/smbd/ipc.c')
| -rw-r--r-- | source3/smbd/ipc.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c index c7a44270f5..26a4212ec9 100644 --- a/source3/smbd/ipc.c +++ b/source3/smbd/ipc.c @@ -105,6 +105,12 @@ void send_trans_reply(connection_struct *conn, reply_outbuf(req, 10, 1+align+this_ldata+this_lparam); + /* + * We might have SMBtranss in req which was transferred to the outbuf, + * fix that. + */ + SCVAL(req->outbuf, smb_com, SMBtrans); + copy_trans_params_and_data((char *)req->outbuf, align, rparam, tot_param_sent, this_lparam, rdata, tot_data_sent, this_ldata); @@ -155,6 +161,12 @@ void send_trans_reply(connection_struct *conn, reply_outbuf(req, 10, 1+align+this_ldata+this_lparam); + /* + * We might have SMBtranss in req which was transferred to the + * outbuf, fix that. + */ + SCVAL(req->outbuf, smb_com, SMBtrans); + copy_trans_params_and_data((char *)req->outbuf, align, rparam, tot_param_sent, this_lparam, rdata, tot_data_sent, this_ldata); @@ -774,12 +786,6 @@ void reply_transs(struct smb_request *req) return; } - /* - * construct_reply_common will copy smb_com from inbuf to - * outbuf. SMBtranss is wrong here. - */ - SCVAL(req->inbuf,smb_com,SMBtrans); - handle_trans(conn, req, state); DLIST_REMOVE(conn->pending_trans, state); |