diff options
| author | Luk Claes <luk@debian.org> | 2012-05-10 18:32:49 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-12 00:44:41 +0200 |
| commit | f6db3d7bef750d48079ff56535f48c9923e5f4c8 (patch) | |
| tree | 35a53ec537bd5fe9a2fd396956d455552ba58acf /source3/libsmb/cli_np_tstream.c | |
| parent | 14473f37f5a3cd4749f5c4f937fef37cc5ea8c47 (diff) | |
| download | samba-f6db3d7bef750d48079ff56535f48c9923e5f4c8.tar.gz samba-f6db3d7bef750d48079ff56535f48c9923e5f4c8.tar.bz2 samba-f6db3d7bef750d48079ff56535f48c9923e5f4c8.zip | |
s3/libsmb: Generalise cli_state in smb2 close calls
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/libsmb/cli_np_tstream.c')
| -rw-r--r-- | source3/libsmb/cli_np_tstream.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c index d52997fbdf..07ccccdd76 100644 --- a/source3/libsmb/cli_np_tstream.c +++ b/source3/libsmb/cli_np_tstream.c @@ -95,7 +95,10 @@ static int tstream_cli_np_destructor(struct tstream_cli_np *cli_nps) if (cli_nps->is_smb1) { status = cli_close(cli_nps->cli, cli_nps->fnum); } else { - status = smb2cli_close(cli_nps->cli, 0, + status = smb2cli_close(cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb2.session, + cli_nps->cli->smb2.tid, 0, cli_nps->fid_persistent, cli_nps->fid_volatile); } @@ -548,7 +551,11 @@ static void tstream_cli_np_writev_disconnect_now(struct tevent_req *req, subreq = cli_close_send(state, state->ev, cli_nps->cli, cli_nps->fnum); } else { - subreq = smb2cli_close_send(state, state->ev, cli_nps->cli, + subreq = smb2cli_close_send(state, state->ev, + cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb2.session, + cli_nps->cli->smb2.tid, 0, /* flags */ cli_nps->fid_persistent, cli_nps->fid_volatile); @@ -1003,7 +1010,11 @@ static void tstream_cli_np_readv_disconnect_now(struct tevent_req *req, subreq = cli_close_send(state, state->ev, cli_nps->cli, cli_nps->fnum); } else { - subreq = smb2cli_close_send(state, state->ev, cli_nps->cli, + subreq = smb2cli_close_send(state, state->ev, + cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb2.session, + cli_nps->cli->smb2.tid, 0, /* flags */ cli_nps->fid_persistent, cli_nps->fid_volatile); @@ -1136,7 +1147,10 @@ static struct tevent_req *tstream_cli_np_disconnect_send(TALLOC_CTX *mem_ctx, subreq = cli_close_send(state, ev, cli_nps->cli, cli_nps->fnum); } else { - subreq = smb2cli_close_send(state, ev, cli_nps->cli, + subreq = smb2cli_close_send(state, ev, cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb2.session, + cli_nps->cli->smb2.tid, 0, /* flags */ cli_nps->fid_persistent, cli_nps->fid_volatile); |