s3: Fix chained sesssetupAndX/tconn messages

[ira/wip.git] / source3 / smbd / process.c

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 487358d701dc492f18355d324fa343d7f27c59ee..0647b99ba022df931ce268e36fce5f960c285611 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1617,6 +1617,13 @@ void chain_reply(struct smb_request *req)
                }
                req->outbuf = NULL;
        } else {
+               /*
+                * Update smb headers where subsequent chained commands
+                * may have updated them.
+                */
+               SCVAL(req->chain_outbuf, smb_tid, CVAL(req->outbuf, smb_tid));
+               SCVAL(req->chain_outbuf, smb_uid, CVAL(req->outbuf, smb_uid));
+
                if (!smb_splice_chain(&req->chain_outbuf,
                                      CVAL(req->outbuf, smb_com),
                                      CVAL(req->outbuf, smb_wct),