diff options
| author | Gregor Beck <gbeck@sernet.de> | 2013-09-12 10:10:06 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-01-07 08:37:40 +0100 |
| commit | c25f19e593bb88486b4d459d2b3df949d6869278 (patch) | |
| tree | aabba46b2b544935c8d1bf3b25632c07d316506d /source3/libsmb/cli_np_tstream.c | |
| parent | a8c6a05976cee9e94001216eebab6a4ae38ec378 (diff) | |
| download | samba-c25f19e593bb88486b4d459d2b3df949d6869278.tar.gz samba-c25f19e593bb88486b4d459d2b3df949d6869278.tar.xz samba-c25f19e593bb88486b4d459d2b3df949d6869278.zip | |
s3:libsmb: let cli_np_tstream use smb1cli_close
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/libsmb/cli_np_tstream.c')
| -rw-r--r-- | source3/libsmb/cli_np_tstream.c | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c index 0fd24ff354..0e2f884192 100644 --- a/source3/libsmb/cli_np_tstream.c +++ b/source3/libsmb/cli_np_tstream.c @@ -94,7 +94,12 @@ static int tstream_cli_np_destructor(struct tstream_cli_np *cli_nps) * never be called. */ if (cli_nps->is_smb1) { - status = cli_close(cli_nps->cli, cli_nps->fnum); + status = smb1cli_close(cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb1.pid, + cli_nps->cli->smb1.tcon, + cli_nps->cli->smb1.session, + cli_nps->fnum, UINT32_MAX); } else { status = smb2cli_close(cli_nps->cli->conn, cli_nps->cli->timeout, @@ -570,8 +575,13 @@ static void tstream_cli_np_writev_disconnect_now(struct tevent_req *req, } if (cli_nps->is_smb1) { - subreq = cli_close_send(state, state->ev, cli_nps->cli, - cli_nps->fnum); + subreq = smb1cli_close_send(state, state->ev, + cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb1.pid, + cli_nps->cli->smb1.tcon, + cli_nps->cli->smb1.session, + cli_nps->fnum, UINT32_MAX); } else { subreq = smb2cli_close_send(state, state->ev, cli_nps->cli->conn, @@ -602,7 +612,7 @@ static void tstream_cli_np_writev_disconnect_done(struct tevent_req *subreq) tstream_context_data(state->stream, struct tstream_cli_np); if (cli_nps->is_smb1) { - cli_close_recv(subreq); + smb1cli_close_recv(subreq); } else { smb2cli_close_recv(subreq); } @@ -1037,8 +1047,13 @@ static void tstream_cli_np_readv_disconnect_now(struct tevent_req *req, } if (cli_nps->is_smb1) { - subreq = cli_close_send(state, state->ev, cli_nps->cli, - cli_nps->fnum); + subreq = smb1cli_close_send(state, state->ev, + cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb1.pid, + cli_nps->cli->smb1.tcon, + cli_nps->cli->smb1.session, + cli_nps->fnum, UINT32_MAX); } else { subreq = smb2cli_close_send(state, state->ev, cli_nps->cli->conn, @@ -1069,7 +1084,7 @@ static void tstream_cli_np_readv_disconnect_done(struct tevent_req *subreq) tstream_context_data(state->stream, struct tstream_cli_np); if (cli_nps->is_smb1) { - cli_close_recv(subreq); + smb1cli_close_recv(subreq); } else { smb2cli_close_recv(subreq); } @@ -1174,8 +1189,12 @@ static struct tevent_req *tstream_cli_np_disconnect_send(TALLOC_CTX *mem_ctx, } if (cli_nps->is_smb1) { - subreq = cli_close_send(state, ev, cli_nps->cli, - cli_nps->fnum); + subreq = smb1cli_close_send(state, ev, cli_nps->cli->conn, + cli_nps->cli->timeout, + cli_nps->cli->smb1.pid, + cli_nps->cli->smb1.tcon, + cli_nps->cli->smb1.session, + cli_nps->fnum, UINT32_MAX); } else { subreq = smb2cli_close_send(state, ev, cli_nps->cli->conn, cli_nps->cli->timeout, @@ -1204,7 +1223,7 @@ static void tstream_cli_np_disconnect_done(struct tevent_req *subreq) NTSTATUS status; if (cli_nps->is_smb1) { - status = cli_close_recv(subreq); + status = smb1cli_close_recv(subreq); } else { status = smb2cli_close_recv(subreq); } |