s3:libsmb: make use of cli_state_[g|s]et_tid()

[kai/samba.git] / source3 / libsmb / clitrans.c

diff --git a/source3/libsmb/clitrans.c b/source3/libsmb/clitrans.c
index 5a27678310d77883318f9dfe0cbf8f33a35fafbb..9755d57254ec3457e1eafc12c81fecaf5c4293bf 100644 (file)
--- 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;
        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) {
 
        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;
        }
 
                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,
        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.pid, tid,

                                        cli->smb1.session,
                                        pipe_name, fid, function, flags,
                                        setup, num_setup, max_setup,
                                        cli->smb1.session,
                                        pipe_name, fid, function, flags,
                                        setup, num_setup, max_setup,


@@ -167,6 +169,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;
        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;
 
        if (cli->case_sensitive) {
                clear_flags |= FLAG_CASELESS_PATHNAMES;


@@ -179,12 +182,13 @@ NTSTATUS cli_trans(TALLOC_CTX *mem_ctx, struct cli_state *cli,
                additional_flags2 |= FLAGS2_DFS_PATHNAMES;
        }
 
                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,
        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.pid, tid,

                               cli->smb1.session,
                               pipe_name, fid, function, flags,
                               setup, num_setup, max_setup,
                               cli->smb1.session,
                               pipe_name, fid, function, flags,
                               setup, num_setup, max_setup,