diff options
| author | Gregor Beck <gbeck@sernet.de> | 2013-09-12 11:43:30 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-01-07 08:37:40 +0100 |
| commit | 68d8aa41e3d89d329f5f970df1b88e87d873bc01 (patch) | |
| tree | 12062923275d1da041d459b887b4af031110e944 /source3/libsmb/cli_np_tstream.c | |
| parent | c25f19e593bb88486b4d459d2b3df949d6869278 (diff) | |
| download | samba-68d8aa41e3d89d329f5f970df1b88e87d873bc01.tar.gz | |
s3:libsmb: let cli_np_tstream use smb1cli_writex
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 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c index 0e2f884192e..a4a41d2db3f 100644 --- a/source3/libsmb/cli_np_tstream.c +++ b/source3/libsmb/cli_np_tstream.c @@ -484,7 +484,12 @@ static void tstream_cli_np_writev_write_next(struct tevent_req *req) } if (cli_nps->is_smb1) { - subreq = cli_write_andx_send(state, state->ev, cli_nps->cli, + subreq = smb1cli_writex_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, 8, /* 8 means message mode. */ cli_nps->write.buf, @@ -525,17 +530,13 @@ static void tstream_cli_np_writev_write_done(struct tevent_req *subreq) struct tstream_cli_np *cli_nps = tstream_context_data(state->stream, struct tstream_cli_np); - size_t written; + uint32_t written; NTSTATUS status; if (cli_nps->is_smb1) { - status = cli_write_andx_recv(subreq, &written); + status = smb1cli_writex_recv(subreq, &written, NULL); } else { - uint32_t smb2_written; - status = smb2cli_write_recv(subreq, &smb2_written); - if (NT_STATUS_IS_OK(status)) { - written = smb2_written; - } + status = smb2cli_write_recv(subreq, &written); } TALLOC_FREE(subreq); if (!NT_STATUS_IS_OK(status)) { |