diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-07-23 20:15:21 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-07-24 00:08:58 +0200 |
| commit | 43b070d8dd20d7a2a1a0ec1eb5ebc679cd699bf3 (patch) | |
| tree | 6097b25d13e25556a5d89430d7b31abc902399df /libcli/smb/smb1cli_trans.c | |
| parent | af90c71ed8e66586aa23f7d0e18efc557c9a0c08 (diff) | |
| download | samba-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 'libcli/smb/smb1cli_trans.c')
| -rw-r--r-- | libcli/smb/smb1cli_trans.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libcli/smb/smb1cli_trans.c b/libcli/smb/smb1cli_trans.c index fadac8e7b4..ca0fdc157d 100644 --- a/libcli/smb/smb1cli_trans.c +++ b/libcli/smb/smb1cli_trans.c @@ -40,7 +40,7 @@ struct smb1cli_trans_state { uint16_t mid; uint32_t pid; uint16_t tid; - uint16_t uid; + struct smbXcli_session *session; const char *pipe_name; uint8_t *pipe_name_conv; size_t pipe_name_conv_len; @@ -415,7 +415,8 @@ struct tevent_req *smb1cli_trans_send( uint8_t additional_flags, uint8_t clear_flags, uint16_t additional_flags2, uint16_t clear_flags2, uint32_t timeout_msec, - uint32_t pid, uint16_t tid, uint16_t uid, + uint32_t pid, uint16_t tid, + struct smbXcli_session *session, const char *pipe_name, uint16_t fid, uint16_t function, int flags, uint16_t *setup, uint8_t num_setup, uint8_t max_setup, uint8_t *param, uint32_t num_param, uint32_t max_param, @@ -470,7 +471,7 @@ struct tevent_req *smb1cli_trans_send( state->rsetup = NULL; state->pid = pid; state->tid = tid; - state->uid = uid; + state->session = session; ZERO_STRUCT(state->rparam); ZERO_STRUCT(state->rdata); @@ -513,7 +514,8 @@ struct tevent_req *smb1cli_trans_send( state->additional_flags2, state->clear_flags2, state->timeout_msec, - state->pid, state->tid, state->uid, + state->pid, state->tid, + state->session, wct, state->vwv, iov_count, state->iov); if (tevent_req_nomem(subreq, req)) { @@ -644,7 +646,8 @@ static void smb1cli_trans_done(struct tevent_req *subreq) state->additional_flags2, state->clear_flags2, state->timeout_msec, - state->pid, state->tid, state->uid, + state->pid, state->tid, + state->session, wct, state->vwv, iov_count, state->iov); if (tevent_req_nomem(subreq2, req)) { @@ -750,7 +753,8 @@ static void smb1cli_trans_done2(struct tevent_req *subreq2) state->additional_flags2, state->clear_flags2, state->timeout_msec, - state->pid, state->tid, state->uid, + state->pid, state->tid, + state->session, wct, state->vwv, iov_count, state->iov); if (tevent_req_nomem(subreq2, req)) { @@ -840,7 +844,8 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn, uint8_t additional_flags, uint8_t clear_flags, uint16_t additional_flags2, uint16_t clear_flags2, uint32_t timeout_msec, - uint32_t pid, uint16_t tid, uint16_t uid, + uint32_t pid, uint16_t tid, + struct smbXcli_session *session, const char *pipe_name, uint16_t fid, uint16_t function, int flags, uint16_t *setup, uint8_t num_setup, uint8_t max_setup, @@ -874,7 +879,7 @@ NTSTATUS smb1cli_trans(TALLOC_CTX *mem_ctx, struct smbXcli_conn *conn, additional_flags, clear_flags, additional_flags2, clear_flags2, timeout_msec, - pid, tid, uid, + pid, tid, session, pipe_name, fid, function, flags, setup, num_setup, max_setup, param, num_param, max_param, |