ctdb-scripts: Ignore shellcheck SC2181 warning (use of $?)

[metze/samba/wip.git] / source3 / libsmb / async_smb.c

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index a82b0ced72a0bc3b3cf10d4ad0052e58cd3f2fd4..bcb24a479437bdc753589c3301e41e4d27d2eeb6 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -54,13 +54,13 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
                                      struct cli_state *cli,
                                      uint8_t smb_command,
                                      uint8_t additional_flags,
+                                     uint16_t additional_flags2,
                                      uint8_t wct, uint16_t *vwv,
                                      int iov_count,
                                      struct iovec *bytes_iov)
 {
        struct cli_smb_req_state *state;
        uint8_t clear_flags = 0;
-       uint16_t additional_flags2 = 0;
        uint16_t clear_flags2 = 0;
 
        state = talloc_zero(mem_ctx, struct cli_smb_req_state);
@@ -76,23 +76,12 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
        }
        *state->ptr = state;
 
-       if (cli->case_sensitive) {
-               clear_flags |= FLAG_CASELESS_PATHNAMES;
-       } else {
-               /* Default setting, case insensitive. */
-               additional_flags |= FLAG_CASELESS_PATHNAMES;
-       }
-
-       if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) {
-               additional_flags2 |= FLAGS2_DFS_PATHNAMES;
-       }
-
        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,
+                                       cli->smb1.tcon,
                                        cli->smb1.session,
                                        wct, vwv, iov_count, bytes_iov);
        if (state->req == NULL) {
@@ -112,13 +101,13 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx,
                                struct cli_state *cli,
                                uint8_t smb_command,
                                uint8_t additional_flags,
+                               uint16_t additional_flags2,
                                uint8_t wct, uint16_t *vwv,
                                uint32_t num_bytes,
                                const uint8_t *bytes)
 {
        struct cli_smb_req_state *state;
        uint8_t clear_flags = 0;
-       uint16_t additional_flags2 = 0;
        uint16_t clear_flags2 = 0;
 
        state = talloc_zero(mem_ctx, struct cli_smb_req_state);
@@ -134,23 +123,12 @@ struct tevent_req *cli_smb_send(TALLOC_CTX *mem_ctx,
        }
        *state->ptr = state;
 
-       if (cli->case_sensitive) {
-               clear_flags |= FLAG_CASELESS_PATHNAMES;
-       } else {
-               /* Default setting, case insensitive. */
-               additional_flags |= FLAG_CASELESS_PATHNAMES;
-       }
-
-       if ((smb1cli_conn_capabilities(cli->conn) & CAP_DFS) && cli->dfsroot) {
-               additional_flags2 |= FLAGS2_DFS_PATHNAMES;
-       }
-
        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,
+                               cli->smb1.tcon,
                                cli->smb1.session,
                                wct, vwv, num_bytes, bytes);
        if (state->req == NULL) {