Ensure the server can cope with multiple secondary trans

requests when signing is turned on.
Jeremy.
(This used to be commit 206464a748a59b1d485d4d3d0cb4d257d60fbd00)

3 files changed, 24 insertions, 0 deletions

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 86d982b022..dd92cc4e4d 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -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"));
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 80297daaef..767df0b725 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -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) {
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 56d1aae3a2..525b015379 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -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);