Fix bug 7583 - Smbclient fails to kerberos connect to a Alfresco JLAN CIFS Server

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

diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index ce225f4e00b14d6487c0f3f5cd4f081d6f63f7ae..4518518a4328c5cc6062ef02b08fbee26e6093fc 100644 (file)
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -201,6 +201,7 @@ struct cli_smb_state {
        uint8_t *inbuf;
        uint32_t seqnum;
        int chain_num;
+       int chain_length;
        struct tevent_req **chained_requests;
 };
 
@@ -382,6 +383,7 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
 {
        struct tevent_req *result;
        struct cli_smb_state *state;
+       struct timeval endtime;
 
        if (iov_count > MAX_SMB_IOV) {
                /*
@@ -422,6 +424,12 @@ struct tevent_req *cli_smb_req_create(TALLOC_CTX *mem_ctx,
        }
        state->iov_count = iov_count + 3;
 
+       if (cli->timeout) {
+               endtime = timeval_current_ofs(0, cli->timeout * 1000);
+               if (!tevent_req_set_endtime(result, ev, endtime)) {
+                       tevent_req_nomem(NULL, result);
+               }
+       }
        return result;
 }
 
@@ -471,7 +479,8 @@ static NTSTATUS cli_smb_req_iov_send(struct tevent_req *req,
        if (state->mid != 0) {
                SSVAL(iov[0].iov_base, smb_mid, state->mid);
        } else {
-               SSVAL(iov[0].iov_base, smb_mid, cli_alloc_mid(state->cli));
+               uint16_t mid = cli_alloc_mid(state->cli);
+               SSVAL(iov[0].iov_base, smb_mid, mid);
        }
 
        smb_setlen((char *)iov[0].iov_base, iov_len(iov, iov_count) - 4);
@@ -603,7 +612,6 @@ static void cli_smb_received(struct tevent_req *subreq)
                subreq, struct cli_state);
        struct tevent_req *req;
        struct cli_smb_state *state;
-       struct tevent_context *ev;
        NTSTATUS status;
        uint8_t *inbuf;
        ssize_t received;
@@ -692,7 +700,6 @@ static void cli_smb_received(struct tevent_req *subreq)
 
        req = cli->pending[i];
        state = tevent_req_data(req, struct cli_smb_state);
-       ev = state->ev;
 
        if (!oplock_break /* oplock breaks are not signed */
            && !cli_check_sign_mac(cli, (char *)inbuf, state->seqnum+1)) {
@@ -706,6 +713,8 @@ static void cli_smb_received(struct tevent_req *subreq)
                state->inbuf = talloc_move(state, &inbuf);
                talloc_set_destructor(req, NULL);
                cli_smb_req_destructor(req);
+               state->chain_num = 0;
+               state->chain_length = 1;
                tevent_req_done(req);
        } else {
                struct tevent_req **chain = talloc_move(
@@ -717,6 +726,7 @@ static void cli_smb_received(struct tevent_req *subreq)
                                                cli_smb_state);
                        state->inbuf = inbuf;
                        state->chain_num = i;
+                       state->chain_length = num_chained;
                        tevent_req_done(chain[i]);
                }
                TALLOC_FREE(inbuf);
@@ -751,8 +761,9 @@ static void cli_smb_received(struct tevent_req *subreq)
        }
 }
 
-NTSTATUS cli_smb_recv(struct tevent_req *req, uint8_t min_wct,
-                     uint8_t *pwct, uint16_t **pvwv,
+NTSTATUS cli_smb_recv(struct tevent_req *req,
+                     TALLOC_CTX *mem_ctx, uint8_t **pinbuf,
+                     uint8_t min_wct, uint8_t *pwct, uint16_t **pvwv,
                      uint32_t *pnum_bytes, uint8_t **pbytes)
 {
        struct cli_smb_state *state = tevent_req_data(
@@ -810,16 +821,30 @@ NTSTATUS cli_smb_recv(struct tevent_req *req, uint8_t min_wct,
 
        status = cli_pull_error((char *)state->inbuf);
 
-       if (!have_andx_command((char *)state->inbuf, wct_ofs)
-           && NT_STATUS_IS_ERR(status)) {
-               /*
-                * The last command takes the error code. All further commands
-                * down the requested chain will get a
-                * NT_STATUS_REQUEST_ABORTED.
-                */
-               return status;
+       if (!have_andx_command((char *)state->inbuf, wct_ofs)) {
+
+               if ((cmd == SMBsesssetupX)
+                   && NT_STATUS_EQUAL(
+                           status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
+                       /*
+                        * NT_STATUS_MORE_PROCESSING_REQUIRED is a
+                        * valid return code for session setup
+                        */
+                       goto no_err;
+               }
+
+               if (NT_STATUS_IS_ERR(status)) {
+                       /*
+                        * The last command takes the error code. All
+                        * further commands down the requested chain
+                        * will get a NT_STATUS_REQUEST_ABORTED.
+                        */
+                       return status;
+               }
        }
 
+no_err:
+
        wct = CVAL(state->inbuf, wct_ofs);
        bytes_offset = wct_ofs + 1 + wct * sizeof(uint16_t);
        num_bytes = SVAL(state->inbuf, bytes_offset);
@@ -850,8 +875,15 @@ NTSTATUS cli_smb_recv(struct tevent_req *req, uint8_t min_wct,
        if (pbytes != NULL) {
                *pbytes = (uint8_t *)state->inbuf + bytes_offset + 2;
        }
+       if ((mem_ctx != NULL) && (pinbuf != NULL)) {
+               if (state->chain_num == state->chain_length-1) {
+                       *pinbuf = talloc_move(mem_ctx, &state->inbuf);
+               } else {
+                       *pinbuf = state->inbuf;
+               }
+       }
 
-       return NT_STATUS_OK;
+       return status;
 }
 
 size_t cli_smb_wct_ofs(struct tevent_req **reqs, int num_reqs)
@@ -1035,11 +1067,13 @@ static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq)
        uint16_t *vwv;
        uint32_t num_bytes;
        uint8_t *bytes;
+       uint8_t *inbuf;
        NTSTATUS status;
 
-       status = cli_smb_recv(subreq, 8, &wct, &vwv, &num_bytes, &bytes);
+       status = cli_smb_recv(subreq, state, &inbuf, 8, &wct, &vwv,
+                             &num_bytes, &bytes);
+       TALLOC_FREE(subreq);
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(subreq);
                tevent_req_nterror(req, status);
                return;
        }