diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-07-23 22:32:49 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-07-24 22:20:06 +0200 |
| commit | 74f9b52e659265c7a6283550d226f0cec5e8fb18 (patch) | |
| tree | dc7b6cfec11071dbb9a18200ee25d4b6f58873c9 /source3 | |
| parent | 32b33999dbc5c73f5efd04e3ae0ab5a0b13c7cc2 (diff) | |
| download | samba-74f9b52e659265c7a6283550d226f0cec5e8fb18.tar.gz samba-74f9b52e659265c7a6283550d226f0cec5e8fb18.tar.bz2 samba-74f9b52e659265c7a6283550d226f0cec5e8fb18.zip | |
libcli/smb: pass smbXcli_tcon to smb2cli_close*()
metze
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/cli_np_tstream.c | 9 | ||||
| -rw-r--r-- | source3/torture/test_smb2.c | 12 |
2 files changed, 11 insertions, 10 deletions
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c index 7482f9da62..47333868dc 100644 --- a/source3/libsmb/cli_np_tstream.c +++ b/source3/libsmb/cli_np_tstream.c @@ -99,7 +99,8 @@ static int tstream_cli_np_destructor(struct tstream_cli_np *cli_nps) status = smb2cli_close(cli_nps->cli->conn, cli_nps->cli->timeout, cli_nps->cli->smb2.session, - cli_nps->cli->smb2.tid, 0, + cli_nps->cli->smb2.tcon, + 0, /* flags */ cli_nps->fid_persistent, cli_nps->fid_volatile); } @@ -574,7 +575,7 @@ static void tstream_cli_np_writev_disconnect_now(struct tevent_req *req, cli_nps->cli->conn, cli_nps->cli->timeout, cli_nps->cli->smb2.session, - cli_nps->cli->smb2.tid, + cli_nps->cli->smb2.tcon, 0, /* flags */ cli_nps->fid_persistent, cli_nps->fid_volatile); @@ -1036,7 +1037,7 @@ static void tstream_cli_np_readv_disconnect_now(struct tevent_req *req, cli_nps->cli->conn, cli_nps->cli->timeout, cli_nps->cli->smb2.session, - cli_nps->cli->smb2.tid, + cli_nps->cli->smb2.tcon, 0, /* flags */ cli_nps->fid_persistent, cli_nps->fid_volatile); @@ -1172,7 +1173,7 @@ static struct tevent_req *tstream_cli_np_disconnect_send(TALLOC_CTX *mem_ctx, subreq = smb2cli_close_send(state, ev, cli_nps->cli->conn, cli_nps->cli->timeout, cli_nps->cli->smb2.session, - cli_nps->cli->smb2.tid, + cli_nps->cli->smb2.tcon, 0, /* flags */ cli_nps->fid_persistent, cli_nps->fid_volatile); diff --git a/source3/torture/test_smb2.c b/source3/torture/test_smb2.c index 6177817dae..a4655dc05d 100644 --- a/source3/torture/test_smb2.c +++ b/source3/torture/test_smb2.c @@ -126,7 +126,7 @@ bool run_smb2_basic(int dummy) } status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session, - cli->smb2.tid, 0, fid_persistent, fid_volatile); + cli->smb2.tcon, 0, fid_persistent, fid_volatile); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_close returned %s\n", nt_errstr(status)); return false; @@ -162,7 +162,7 @@ bool run_smb2_basic(int dummy) } status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session, - cli->smb2.tid, 0, fid_persistent, fid_volatile); + cli->smb2.tcon, 0, fid_persistent, fid_volatile); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_close returned %s\n", nt_errstr(status)); return false; @@ -1385,7 +1385,7 @@ bool run_smb2_multi_channel(int dummy) } status = smb2cli_close(cli3->conn, cli3->timeout, cli3->smb2.session, - cli3->smb2.tid, 0, fid_persistent, fid_volatile); + cli3->smb2.tcon, 0, fid_persistent, fid_volatile); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_close returned %s\n", nt_errstr(status)); return false; @@ -1830,7 +1830,7 @@ bool run_smb2_session_reauth(int dummy) } status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session, - cli->smb2.tid, 0, fid_persistent, fid_volatile); + cli->smb2.tcon, 0, fid_persistent, fid_volatile); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_close returned %s\n", nt_errstr(status)); return false; @@ -1864,14 +1864,14 @@ bool run_smb2_session_reauth(int dummy) } status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session, - cli->smb2.tid, 0, dir_persistent, dir_volatile); + cli->smb2.tcon, 0, dir_persistent, dir_volatile); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_close returned %s\n", nt_errstr(status)); return false; } status = smb2cli_close(cli->conn, cli->timeout, cli->smb2.session, - cli->smb2.tid, 0, fid_persistent, fid_volatile); + cli->smb2.tcon, 0, fid_persistent, fid_volatile); if (!NT_STATUS_IS_OK(status)) { printf("smb2cli_close returned %s\n", nt_errstr(status)); return false; |