summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-07-23 20:15:21 +0200
committerStefan Metzmacher <metze@samba.org>2012-07-24 00:08:58 +0200
commit43b070d8dd20d7a2a1a0ec1eb5ebc679cd699bf3 (patch)
tree6097b25d13e25556a5d89430d7b31abc902399df /source3/libsmb
parentaf90c71ed8e66586aa23f7d0e18efc557c9a0c08 (diff)
downloadsamba-43b070d8dd20d7a2a1a0ec1eb5ebc679cd699bf3.tar.gz
samba-43b070d8dd20d7a2a1a0ec1eb5ebc679cd699bf3.tar.bz2
samba-43b070d8dd20d7a2a1a0ec1eb5ebc679cd699bf3.zip
libcli/smb: pass down smbXcli_session to smb1cli_req_create/send() and smb1cli_trans*
metze Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Tue Jul 24 00:08:58 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/async_smb.c8
-rw-r--r--source3/libsmb/clitrans.c10
2 files changed, 6 insertions, 12 deletions
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 4350d8f1bd..a82b0ced72 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 uid = 0;
state = talloc_zero(mem_ctx, struct cli_smb_req_state);
if (state == NULL) {
@@ -88,14 +87,13 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
additional_flags2 |= FLAGS2_DFS_PATHNAMES;
}
- uid = cli_state_get_uid(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,
cli->smb1.tid,
- uid,
+ cli->smb1.session,
wct, vwv, iov_count, bytes_iov);
if (state->req == NULL) {
talloc_free(state);
@@ -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 uid = 0;
state = talloc_zero(mem_ctx, struct cli_smb_req_state);
if (state == NULL) {
@@ -148,14 +145,13 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx,
additional_flags2 |= FLAGS2_DFS_PATHNAMES;
}
- uid = cli_state_get_uid(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,
cli->smb1.tid,
- uid,
+ cli->smb1.session,
wct, vwv, num_bytes, bytes);
if (state->req == NULL) {
talloc_free(state);
diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index a3ac816e8a..5a27678310 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 uid = 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;
}
- uid = cli_state_get_uid(cli);
state->req = smb1cli_trans_send(state, ev,
cli->conn, cmd,
additional_flags, clear_flags,
additional_flags2, clear_flags2,
cli->timeout,
- cli->smb1.pid, cli->smb1.tid, uid,
+ cli->smb1.pid, cli->smb1.tid,
+ cli->smb1.session,
pipe_name, fid, function, flags,
setup, num_setup, max_setup,
param, num_param, max_param,
@@ -168,7 +167,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 uid = 0;
if (cli->case_sensitive) {
clear_flags |= FLAG_CASELESS_PATHNAMES;
@@ -181,13 +179,13 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
additional_flags2 |= FLAGS2_DFS_PATHNAMES;
}
- uid = cli_state_get_uid(cli);
status = smb1cli_trans(mem_ctx,
cli->conn, trans_cmd,
additional_flags, clear_flags,
additional_flags2, clear_flags2,
cli->timeout,
- cli->smb1.pid, cli->smb1.tid, uid,
+ cli->smb1.pid, cli->smb1.tid,
+ cli->smb1.session,
pipe_name, fid, function, flags,
setup, num_setup, max_setup,
param, num_param, max_param,