From cdec0c46464c8b524fc64ff46f1af809af026086 Mon Sep 17 00:00:00 2001 From: Luk Claes Date: Sat, 2 Jun 2012 12:45:40 +0200 Subject: s3:libsmb: use cli_state_{g,s}et_uid instead of smb1.uid directly Signed-off-by: Luk Claes Signed-off-by: Stefan Metzmacher --- source3/libsmb/clitrans.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source3/libsmb/clitrans.c') diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c index 5dd7008c59..a3ac816e8a 100644 --- a/source3/libsmb/clitrans.c +++ b/source3/libsmb/clitrans.c @@ -61,6 +61,7 @@ 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) { @@ -84,12 +85,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, cli->smb1.uid, + cli->smb1.pid, cli->smb1.tid, uid, pipe_name, fid, function, flags, setup, num_setup, max_setup, param, num_param, max_param, @@ -166,6 +168,7 @@ 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; @@ -178,12 +181,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, cli->smb1.uid, + cli->smb1.pid, cli->smb1.tid, uid, pipe_name, fid, function, flags, setup, num_setup, max_setup, param, num_param, max_param, -- cgit