Correctly set cli->raw_status for libsmbclient in SMB2 code

The SMB2 file handling code wasn't correctly setting raw_status, which
is used by libsmbclient to report file open errors etc.

https://bugzilla.samba.org/show_bug.cgi?id=11276

Signed-off-by: Robin McCorkell <robin@mccorkell.me.uk>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index c9f40605e880900fd7c3780175d816103b330170..a17d918c7881fe5f8ed590ec02a28bd0ebe0d60e 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -262,6 +262,7 @@ NTSTATUS cli_smb2_create_fnum_recv(struct tevent_req *req, uint16_t *pfnum,
        NTSTATUS status;
 
        if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
                return status;
        }
        if (pfnum != NULL) {
@@ -270,6 +271,7 @@ NTSTATUS cli_smb2_create_fnum_recv(struct tevent_req *req, uint16_t *pfnum,
        if (cr != NULL) {
                *cr = state->cr;
        }
+       state->cli->raw_status = NT_STATUS_OK;
        return NT_STATUS_OK;
 }
 
@@ -390,7 +392,11 @@ static void cli_smb2_close_fnum_done(struct tevent_req *subreq)
 
 NTSTATUS cli_smb2_close_fnum_recv(struct tevent_req *req)
 {
-       return tevent_req_simple_recv_ntstatus(req);
+       struct cli_smb2_close_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_close_fnum_state);
+       NTSTATUS status = tevent_req_simple_recv_ntstatus(req);
+       state->cli->raw_status = status;
+       return status;
 }
 
 NTSTATUS cli_smb2_close_fnum(struct cli_state *cli, uint16_t fnum)
@@ -2302,6 +2308,7 @@ NTSTATUS cli_smb2_read_recv(struct tevent_req *req,
                                req, struct cli_smb2_read_state);
 
        if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
                return status;
        }
        /*
@@ -2311,6 +2318,7 @@ NTSTATUS cli_smb2_read_recv(struct tevent_req *req,
         */
        *received = (ssize_t)state->received;
        *rcvbuf = state->buf;
+       state->cli->raw_status = NT_STATUS_OK;
        return NT_STATUS_OK;
 }
 
@@ -2409,6 +2417,7 @@ NTSTATUS cli_smb2_write_recv(struct tevent_req *req,
        NTSTATUS status;
 
        if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
                tevent_req_received(req);
                return status;
        }
@@ -2416,6 +2425,7 @@ NTSTATUS cli_smb2_write_recv(struct tevent_req *req,
        if (pwritten != NULL) {
                *pwritten = (size_t)state->written;
        }
+       state->cli->raw_status = NT_STATUS_OK;
        tevent_req_received(req);
        return NT_STATUS_OK;
 }
@@ -2573,11 +2583,13 @@ NTSTATUS cli_smb2_writeall_recv(struct tevent_req *req,
        NTSTATUS status;
 
        if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
                return status;
        }
        if (pwritten != NULL) {
                *pwritten = (size_t)state->written;
        }
+       state->cli->raw_status = NT_STATUS_OK;
        return NT_STATUS_OK;
 }
 
@@ -2838,12 +2850,14 @@ NTSTATUS cli_smb2_splice_recv(struct tevent_req *req, off_t *written)
        NTSTATUS status;
 
        if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
                tevent_req_received(req);
                return status;
        }
        if (written != NULL) {
                *written = state->written;
        }
+       state->cli->raw_status = NT_STATUS_OK;
        tevent_req_received(req);
        return NT_STATUS_OK;
 }