1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00

Ensure the server can cope with multiple secondary trans

requests when signing is turned on.
Jeremy.
(This used to be commit 206464a748)
This commit is contained in:
Jeremy Allison 2003-12-01 06:53:10 +00:00
parent 27891bdef1
commit 570f2b73b4
3 changed files with 24 additions and 0 deletions

View File

@ -445,6 +445,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
of the parameter/data bytes */
outsize = set_message(outbuf,0,0,True);
show_msg(outbuf);
srv_signing_trans_stop();
if (!send_smb(smbd_server_fd(),outbuf))
exit_server("reply_trans: send_smb failed.");
}
@ -456,6 +457,13 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
/*
* The sequence number for the trans reply is always
* based on the last secondary received.
*/
srv_signing_trans_start(SVAL(inbuf,smb_mid));
if ((ret && (CVAL(inbuf, smb_com) != SMBtranss)) || !ret) {
if(ret) {
DEBUG(0,("reply_trans: Invalid secondary trans packet\n"));

View File

@ -2488,6 +2488,7 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
/* We need to send an interim response then receive the rest
of the parameter/data bytes */
outsize = set_message(outbuf,0,0,True);
srv_signing_trans_stop();
if (!send_smb(smbd_server_fd(),outbuf))
exit_server("reply_nttrans: send_smb failed.");
@ -2498,6 +2499,13 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
/*
* The sequence number for the trans reply is always
* based on the last secondary received.
*/
srv_signing_trans_start(SVAL(inbuf,smb_mid));
if((ret && (CVAL(inbuf, smb_com) != SMBnttranss)) || !ret) {
outsize = set_message(outbuf,0,0,True);
if(ret) {

View File

@ -3523,6 +3523,7 @@ int reply_trans2(connection_struct *conn,
/* We need to send an interim response then receive the rest
of the parameter/data bytes */
outsize = set_message(outbuf,0,0,True);
srv_signing_trans_stop();
if (!send_smb(smbd_server_fd(),outbuf))
exit_server("reply_trans2: send_smb failed.");
@ -3536,6 +3537,13 @@ int reply_trans2(connection_struct *conn,
ret = receive_next_smb(inbuf,bufsize,SMB_SECONDARY_WAIT);
/*
* The sequence number for the trans reply is always
* based on the last secondary received.
*/
srv_signing_trans_start(SVAL(inbuf,smb_mid));
if ((ret &&
(CVAL(inbuf, smb_com) != SMBtranss2)) || !ret) {
outsize = set_message(outbuf,0,0,True);