diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-07-23 21:34:58 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-07-24 21:22:44 +0200 |
| commit | b9100a7ac443159716398aaadfab34af64d8858b (patch) | |
| tree | 7148b0a41ec094b19e27b2ee85b18cded4f88254 /source3 | |
| parent | 29dc01b1755081b1b7a9b38ad4f7e6fdaa795bf9 (diff) | |
| download | samba-b9100a7ac443159716398aaadfab34af64d8858b.tar.gz samba-b9100a7ac443159716398aaadfab34af64d8858b.tar.bz2 samba-b9100a7ac443159716398aaadfab34af64d8858b.zip | |
libcli/smb: pass down smbXcli_tcon to smb1cli_req_create/send() and smb1cli_trans*
metze
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue Jul 24 21:22:44 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/libsmb/async_smb.c | 8 | ||||
| -rw-r--r-- | source3/libsmb/clitrans.c | 10 |
2 files changed, 6 insertions, 12 deletions
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index 9704ea59a9..ed68a5d927 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -62,7 +62,6 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx, uint8_t clear_flags = 0; uint16_t additional_flags2 = 0; uint16_t clear_flags2 = 0; - uint16_t tid = 0; state = talloc_zero(mem_ctx, struct cli_smb_req_state); if (state == NULL) { @@ -88,13 +87,12 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx, additional_flags2 |= FLAGS2_DFS_PATHNAMES; } - tid = cli_state_get_tid(cli); state->req = smb1cli_req_create(state, ev, cli->conn, smb_command, additional_flags, clear_flags, additional_flags2, clear_flags2, cli->timeout, cli->smb1.pid, - tid, + cli->smb1.tcon, cli->smb1.session, wct, vwv, iov_count, bytes_iov); if (state->req == NULL) { @@ -122,7 +120,6 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx, uint8_t clear_flags = 0; uint16_t additional_flags2 = 0; uint16_t clear_flags2 = 0; - uint16_t tid = 0; state = talloc_zero(mem_ctx, struct cli_smb_req_state); if (state == NULL) { @@ -148,13 +145,12 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx, additional_flags2 |= FLAGS2_DFS_PATHNAMES; } - tid = cli_state_get_tid(cli); state->req = smb1cli_req_send(state, ev, cli->conn, smb_command, additional_flags, clear_flags, additional_flags2, clear_flags2, cli->timeout, cli->smb1.pid, - tid, + cli->smb1.tcon, cli->smb1.session, wct, vwv, num_bytes, bytes); if (state->req == NULL) { diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index 9755d57254..08fda5fdb5 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -61,7 +61,6 @@ struct tevent_req *cli_trans_send( uint8_t clear_flags = 0; uint16_t additional_flags2 = 0; uint16_t clear_flags2 = 0; - uint16_t tid = 0; state = talloc_zero(mem_ctx, struct cli_trans_state); if (state == NULL) { @@ -85,13 +84,13 @@ struct tevent_req *cli_trans_send( additional_flags2 |= FLAGS2_DFS_PATHNAMES; } - tid = cli_state_get_tid(cli); state->req = smb1cli_trans_send(state, ev, cli->conn, cmd, additional_flags, clear_flags, additional_flags2, clear_flags2, cli->timeout, - cli->smb1.pid, tid, + cli->smb1.pid, + cli->smb1.tcon, cli->smb1.session, pipe_name, fid, function, flags, setup, num_setup, max_setup, @@ -169,7 +168,6 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli, uint8_t clear_flags = 0; uint16_t additional_flags2 = 0; uint16_t clear_flags2 = 0; - uint16_t tid = 0; if (cli->case_sensitive) { clear_flags |= FLAG_CASELESS_PATHNAMES; @@ -182,13 +180,13 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli, additional_flags2 |= FLAGS2_DFS_PATHNAMES; } - tid = cli_state_get_tid(cli); status = smb1cli_trans(mem_ctx, cli->conn, trans_cmd, additional_flags, clear_flags, additional_flags2, clear_flags2, cli->timeout, - cli->smb1.pid, tid, + cli->smb1.pid, + cli->smb1.tcon, cli->smb1.session, pipe_name, fid, function, flags, setup, num_setup, max_setup, |