summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-07-25 10:36:27 +0200
committerStefan Metzmacher <metze@samba.org>2012-07-25 12:15:04 +0200
commit7de4ae7f9fbf642899afd8c89d0b3af72155e022 (patch)
tree74d0860ceb0ddc18634d135334fb10e4e4170010 /source3
parent57fda88dfb685ca9ba84cda6799efcc2224e242f (diff)
downloadsamba-7de4ae7f9fbf642899afd8c89d0b3af72155e022.tar.gz
samba-7de4ae7f9fbf642899afd8c89d0b3af72155e022.tar.bz2
samba-7de4ae7f9fbf642899afd8c89d0b3af72155e022.zip
libcli/smb: pass smbXcli_tcon to smb2cli_req_create/send()
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/smb2cli_tcon.c9
1 files changed, 2 insertions, 7 deletions
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);