[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  9005e0f s3:smb2cli: let smb2cli_req_create() use the give pid, uid and tid values
       via  2ec0634 s3:smb2cli: pass the uid to the SMB2_SESSION_SETUP to support multi-leg-auth
      from  4ee613b talloc: Remove an unused variable

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9005e0f7b36771df0da96764841a32d5a1627aca
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Sep 7 15:59:05 2011 +0200

    s3:smb2cli: let smb2cli_req_create() use the give pid, uid and tid values
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Sep  7 18:19:43 CEST 2011 on sn-devel-104

commit 2ec0634f288929fb43fe379cda8e15a8bc028677
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Aug 31 00:32:48 2011 +0200

    s3:smb2cli: pass the uid to the SMB2_SESSION_SETUP to support multi-leg-auth
    
    metze

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

Summary of changes:
 source3/libsmb/smb2cli_base.c    |    6 +++---
 source3/libsmb/smb2cli_session.c |    3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c
index 7f4b176..5089aa9 100644
--- a/source3/libsmb/smb2cli_base.c
+++ b/source3/libsmb/smb2cli_base.c
@@ -219,9 +219,9 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
 	SSVAL(state->hdr, SMB2_HDR_OPCODE,	cmd);
 	SSVAL(state->hdr, SMB2_HDR_CREDIT,	31);
 	SIVAL(state->hdr, SMB2_HDR_FLAGS,	flags);
-	SIVAL(state->hdr, SMB2_HDR_PID,		cli->smb2.pid);
-	SIVAL(state->hdr, SMB2_HDR_TID,		cli->smb2.tid);
-	SBVAL(state->hdr, SMB2_HDR_SESSION_ID,	cli->smb2.uid);
+	SIVAL(state->hdr, SMB2_HDR_PID,		pid);
+	SIVAL(state->hdr, SMB2_HDR_TID,		tid);
+	SBVAL(state->hdr, SMB2_HDR_SESSION_ID,	uid);
 
 	return req;
 }
diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c
index 0fd91a8..4ffdf13 100644
--- a/source3/libsmb/smb2cli_session.c
+++ b/source3/libsmb/smb2cli_session.c
@@ -76,7 +76,8 @@ static struct tevent_req *smb2cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx,
 	subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_SESSSETUP,
 				  0, 0, /* flags */
 				  cli->smb2.pid,
-				  0, 0, /* tid, uid */
+				  0, /* tid */
+				  cli->smb2.uid,
 				  state->fixed, sizeof(state->fixed),
 				  dyn, dyn_len);
 	if (tevent_req_nomem(subreq, req)) {


-- 
Samba Shared Repository