[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-927-gb6c86e1

[Jeremy Allison]

The branch, v3-4-test has been updated
       via  b6c86e1ef28d9008eec1d39ad714a475dc735c38 (commit)
      from  3f55201564afae5681b3530cb767da7f2b64794c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit b6c86e1ef28d9008eec1d39ad714a475dc735c38
Author: Tim Prouty <tprouty at samba.org>
Date:   Wed Mar 25 00:24:55 2009 +0000

    s3: Fix chained sesssetupAndX/tconn messages
    
    A sesssetupAndX chained with a tconn will not correctly set the TID in
    the response header.  I'm seeing an XP client send this chained
    sesssetup/tconn when samba has security = share.  Samba's current
    behavior is to return a TID of 0 in the smb header rather than the
    actual TID.  This patch also updates the UID in the header as well.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/process.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6d53bbe..9b7a38b 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1609,6 +1609,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),


-- 
Samba Shared Repository