[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1346-g5c54e4c

[Volker Lendecke]

The branch, master has been updated
       via  5c54e4c103c99ec5be836cdd51469ce2558366fb (commit)
      from  5268783e5cb5d77b3fa016d1da6ddf197d7bd8a8 (commit)

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


- Log -----------------------------------------------------------------
commit 5c54e4c103c99ec5be836cdd51469ce2558366fb
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Sep 3 09:18:10 2009 +0200

    s3:libsmb: Attempt to fix bug 6665
    
    Before the async libsmb rewrites, we sent tid==0 on negprot. With the rewrite,
    we send 0xffff. This *should* not matter, but this is one difference in the
    sniffs I see.

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

Summary of changes:
 source3/libsmb/cliconnect.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 239dfc8..600f8d1 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -1607,6 +1607,7 @@ struct tevent_req *cli_negprot_send(TALLOC_CTX *mem_ctx,
 	struct cli_negprot_state *state;
 	uint8_t *bytes = NULL;
 	int numprots;
+	uint16_t cnum;
 
 	req = tevent_req_create(mem_ctx, &state, struct cli_negprot_state);
 	if (req == NULL) {
@@ -1637,8 +1638,13 @@ struct tevent_req *cli_negprot_send(TALLOC_CTX *mem_ctx,
 		}
 	}
 
+	cnum = cli->cnum;
+
+	cli->cnum = 0;
 	subreq = cli_smb_send(state, ev, cli, SMBnegprot, 0, 0, NULL,
 			      talloc_get_size(bytes), bytes);
+	cli->cnum = cnum;
+
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}


-- 
Samba Shared Repository