From 7de4ae7f9fbf642899afd8c89d0b3af72155e022 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 25 Jul 2012 10:36:27 +0200 Subject: libcli/smb: pass smbXcli_tcon to smb2cli_req_create/send() metze --- source3/libsmb/smb2cli_tcon.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'source3/libsmb') diff --git a/source3/libsmb/smb2cli_tcon.c b/source3/libsmb/smb2cli_tcon.c index 7271ddaa8e..d2607824ff 100644 --- a/source3/libsmb/smb2cli_tcon.c +++ b/source3/libsmb/smb2cli_tcon.c @@ -85,7 +85,7 @@ struct tevent_req *smb2cli_tcon_send(TALLOC_CTX *mem_ctx, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, - 0, /* tid */ + NULL, /* tcon */ cli->smb2.session, state->fixed, sizeof(state->fixed), dyn, dyn_len); @@ -198,7 +198,6 @@ struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx, { struct tevent_req *req, *subreq; struct smb2cli_tdis_state *state; - uint32_t tcon_id = 0; req = tevent_req_create(mem_ctx, &state, struct smb2cli_tdis_state); @@ -208,15 +207,11 @@ struct tevent_req *smb2cli_tdis_send(TALLOC_CTX *mem_ctx, state->cli = cli; SSVAL(state->fixed, 0, 4); - if (cli->smb2.tcon) { - tcon_id = smb2cli_tcon_current_id(cli->smb2.tcon); - } - subreq = smb2cli_req_send(state, ev, cli->conn, SMB2_OP_TDIS, 0, 0, /* flags */ cli->timeout, cli->smb2.pid, - tcon_id, + cli->smb2.tcon, cli->smb2.session, state->fixed, sizeof(state->fixed), NULL, 0); -- cgit