s3: libsmb: add replace support to SMB2 rename
[sfrench/samba-autobuild/.git] / source3 / libsmb / cli_smb2_fnum.c
index 18b03f3d4faae0bb666b42580f81426c4f10e41e..351fccfb6453d07ddd5420ee5c04628232d848a6 100644 (file)
@@ -30,7 +30,6 @@
 #include "client.h"
 #include "async_smb.h"
 #include "../libcli/smb/smbXcli_base.h"
-#include "smb2cli.h"
 #include "cli_smb2_fnum.h"
 #include "trans2.h"
 #include "clirap.h"
 #include "libsmb/proto.h"
 #include "lib/util/tevent_ntstatus.h"
 #include "../libcli/security/security.h"
+#include "../librpc/gen_ndr/ndr_security.h"
 #include "lib/util_ea.h"
+#include "librpc/gen_ndr/ndr_ioctl.h"
+#include "ntioctl.h"
 
 struct smb2_hnd {
        uint64_t fid_persistent;
@@ -151,9 +153,183 @@ static uint8_t flags_to_smb2_oplock(uint32_t create_flags)
 
 /***************************************************************
  Small wrapper that allows SMB2 create to return a uint16_t fnum.
- Synchronous only.
 ***************************************************************/
 
+struct cli_smb2_create_fnum_state {
+       struct cli_state *cli;
+       struct smb_create_returns cr;
+       uint16_t fnum;
+       struct tevent_req *subreq;
+};
+
+static void cli_smb2_create_fnum_done(struct tevent_req *subreq);
+static bool cli_smb2_create_fnum_cancel(struct tevent_req *req);
+
+struct tevent_req *cli_smb2_create_fnum_send(TALLOC_CTX *mem_ctx,
+                                            struct tevent_context *ev,
+                                            struct cli_state *cli,
+                                            const char *fname,
+                                            uint32_t create_flags,
+                                            uint32_t desired_access,
+                                            uint32_t file_attributes,
+                                            uint32_t share_access,
+                                            uint32_t create_disposition,
+                                            uint32_t create_options)
+{
+       struct tevent_req *req, *subreq;
+       struct cli_smb2_create_fnum_state *state;
+       size_t fname_len = 0;
+       const char *startp = NULL;
+       const char *endp = NULL;
+       time_t tstamp = (time_t)0;
+       struct smb2_create_blobs *cblobs = NULL;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_smb2_create_fnum_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->cli = cli;
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
+
+       if (cli->backup_intent) {
+               create_options |= FILE_OPEN_FOR_BACKUP_INTENT;
+       }
+
+       /* Check for @GMT- paths. Remove the @GMT and turn into TWrp if so. */
+       fname_len = strlen(fname);
+       if (clistr_is_previous_version_path(fname, &startp, &endp, &tstamp)) {
+               size_t len_before_gmt = startp - fname;
+               size_t len_after_gmt = fname + fname_len - endp;
+               DATA_BLOB twrp_blob;
+               NTTIME ntt;
+               NTSTATUS status;
+
+               char *new_fname = talloc_array(state, char,
+                               len_before_gmt + len_after_gmt + 1);
+
+               if (tevent_req_nomem(new_fname, req)) {
+                       return tevent_req_post(req, ev);
+               }
+
+               memcpy(new_fname, fname, len_before_gmt);
+               memcpy(new_fname + len_before_gmt, endp, len_after_gmt + 1);
+               fname = new_fname;
+               fname_len = len_before_gmt + len_after_gmt;
+
+               unix_to_nt_time(&ntt, tstamp);
+               twrp_blob = data_blob_const((const void *)&ntt, 8);
+
+               cblobs = talloc_zero(state, struct smb2_create_blobs);
+               if (tevent_req_nomem(cblobs, req)) {
+                       return tevent_req_post(req, ev);
+               }
+
+               status = smb2_create_blob_add(state, cblobs,
+                               SMB2_CREATE_TAG_TWRP, twrp_blob);
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
+                       return tevent_req_post(req, ev);
+               }
+       }
+
+       /* SMB2 is pickier about pathnames. Ensure it doesn't
+          start in a '\' */
+       if (*fname == '\\') {
+               fname++;
+               fname_len--;
+       }
+
+       /* Or end in a '\' */
+       if (fname_len > 0 && fname[fname_len-1] == '\\') {
+               char *new_fname = talloc_strdup(state, fname);
+               if (tevent_req_nomem(new_fname, req)) {
+                       return tevent_req_post(req, ev);
+               }
+               new_fname[fname_len-1] = '\0';
+               fname = new_fname;
+       }
+
+       subreq = smb2cli_create_send(state, ev,
+                                    cli->conn,
+                                    cli->timeout,
+                                    cli->smb2.session,
+                                    cli->smb2.tcon,
+                                    fname,
+                                    flags_to_smb2_oplock(create_flags),
+                                    SMB2_IMPERSONATION_IMPERSONATION,
+                                    desired_access,
+                                    file_attributes,
+                                    share_access,
+                                    create_disposition,
+                                    create_options,
+                                    cblobs);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, cli_smb2_create_fnum_done, req);
+
+       state->subreq = subreq;
+       tevent_req_set_cancel_fn(req, cli_smb2_create_fnum_cancel);
+
+       return req;
+}
+
+static void cli_smb2_create_fnum_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb2_create_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_create_fnum_state);
+       struct smb2_hnd h;
+       NTSTATUS status;
+
+       status = smb2cli_create_recv(subreq, &h.fid_persistent,
+                                    &h.fid_volatile, &state->cr, NULL, NULL);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       status = map_smb2_handle_to_fnum(state->cli, &h, &state->fnum);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+       tevent_req_done(req);
+}
+
+static bool cli_smb2_create_fnum_cancel(struct tevent_req *req)
+{
+       struct cli_smb2_create_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_create_fnum_state);
+       return tevent_req_cancel(state->subreq);
+}
+
+NTSTATUS cli_smb2_create_fnum_recv(struct tevent_req *req, uint16_t *pfnum,
+                                  struct smb_create_returns *cr)
+{
+       struct cli_smb2_create_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_create_fnum_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
+               return status;
+       }
+       if (pfnum != NULL) {
+               *pfnum = state->fnum;
+       }
+       if (cr != NULL) {
+               *cr = state->cr;
+       }
+       state->cli->raw_status = NT_STATUS_OK;
+       return NT_STATUS_OK;
+}
+
 NTSTATUS cli_smb2_create_fnum(struct cli_state *cli,
                        const char *fname,
                        uint32_t create_flags,
@@ -163,97 +339,149 @@ NTSTATUS cli_smb2_create_fnum(struct cli_state *cli,
                        uint32_t create_disposition,
                        uint32_t create_options,
                        uint16_t *pfid,
-                       struct smb2_create_returns *cr)
+                       struct smb_create_returns *cr)
 {
-       NTSTATUS status;
-       struct smb2_hnd h;
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
                /*
                 * Can't use sync call while an async call is in flight
                 */
-               return NT_STATUS_INVALID_PARAMETER;
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+       ev = samba_tevent_context_init(frame);
+       if (ev == NULL) {
+               goto fail;
+       }
+       req = cli_smb2_create_fnum_send(frame, ev, cli, fname, create_flags,
+                                       desired_access, file_attributes,
+                                       share_access, create_disposition,
+                                       create_options);
+       if (req == NULL) {
+               goto fail;
+       }
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+               goto fail;
+       }
+       status = cli_smb2_create_fnum_recv(req, pfid, cr);
+ fail:
+       TALLOC_FREE(frame);
+       return status;
+}
+
+/***************************************************************
+ Small wrapper that allows SMB2 close to use a uint16_t fnum.
+***************************************************************/
+
+struct cli_smb2_close_fnum_state {
+       struct cli_state *cli;
+       uint16_t fnum;
+       struct smb2_hnd *ph;
+};
+
+static void cli_smb2_close_fnum_done(struct tevent_req *subreq);
+
+struct tevent_req *cli_smb2_close_fnum_send(TALLOC_CTX *mem_ctx,
+                                           struct tevent_context *ev,
+                                           struct cli_state *cli,
+                                           uint16_t fnum)
+{
+       struct tevent_req *req, *subreq;
+       struct cli_smb2_close_fnum_state *state;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_smb2_close_fnum_state);
+       if (req == NULL) {
+               return NULL;
        }
+       state->cli = cli;
+       state->fnum = fnum;
 
        if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
-               return NT_STATUS_INVALID_PARAMETER;
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
        }
 
-       if (cli->backup_intent) {
-               create_options |= FILE_OPEN_FOR_BACKUP_INTENT;
+       status = map_fnum_to_smb2_handle(cli, fnum, &state->ph);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
        }
 
-       /* SMB2 is pickier about pathnames. Ensure it doesn't
-          start in a '\' */
-       if (*fname == '\\') {
-               fname++;
+       subreq = smb2cli_close_send(state, ev, cli->conn, cli->timeout,
+                                   cli->smb2.session, cli->smb2.tcon,
+                                   0, state->ph->fid_persistent,
+                                   state->ph->fid_volatile);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
        }
+       tevent_req_set_callback(subreq, cli_smb2_close_fnum_done, req);
+       return req;
+}
 
-       status = smb2cli_create(cli->conn,
-                               cli->timeout,
-                               cli->smb2.session,
-                               cli->smb2.tcon,
-                               fname,
-                               flags_to_smb2_oplock(create_flags),
-                               SMB2_IMPERSONATION_IMPERSONATION,
-                               desired_access,
-                               file_attributes,
-                               share_access,
-                               create_disposition,
-                               create_options,
-                               NULL,
-                               &h.fid_persistent,
-                               &h.fid_volatile,
-                               cr);
+static void cli_smb2_close_fnum_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb2_close_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_close_fnum_state);
+       NTSTATUS status;
 
-       if (NT_STATUS_IS_OK(status)) {
-               status = map_smb2_handle_to_fnum(cli, &h, pfid);
+       status = smb2cli_close_recv(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
        }
 
-       return status;
+       /* Delete the fnum -> handle mapping. */
+       status = delete_smb2_handle_mapping(state->cli, &state->ph,
+                                           state->fnum);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+       tevent_req_done(req);
 }
 
-/***************************************************************
- Small wrapper that allows SMB2 close to use a uint16_t fnum.
- Synchronous only.
-***************************************************************/
+NTSTATUS cli_smb2_close_fnum_recv(struct tevent_req *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)
 {
-       struct smb2_hnd *ph = NULL;
-       NTSTATUS status;
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
                /*
                 * Can't use sync call while an async call is in flight
                 */
-               return NT_STATUS_INVALID_PARAMETER;
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
        }
-
-       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
-               return NT_STATUS_INVALID_PARAMETER;
+       ev = samba_tevent_context_init(frame);
+       if (ev == NULL) {
+               goto fail;
        }
-
-       status = map_fnum_to_smb2_handle(cli,
-                                       fnum,
-                                       &ph);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
+       req = cli_smb2_close_fnum_send(frame, ev, cli, fnum);
+       if (req == NULL) {
+               goto fail;
        }
-
-       status = smb2cli_close(cli->conn,
-                               cli->timeout,
-                               cli->smb2.session,
-                               cli->smb2.tcon,
-                               0,
-                               ph->fid_persistent,
-                               ph->fid_volatile);
-
-       /* Delete the fnum -> handle mapping. */
-       if (NT_STATUS_IS_OK(status)) {
-               status = delete_smb2_handle_mapping(cli, &ph, fnum);
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+               goto fail;
        }
-
+       status = cli_smb2_close_fnum_recv(req);
+ fail:
+       TALLOC_FREE(frame);
        return status;
 }
 
@@ -412,7 +640,7 @@ static NTSTATUS parse_finfo_id_both_directory_info(uint8_t *dir_data,
        if (namelen > (dir_data_length - 104)) {
                return NT_STATUS_INFO_LENGTH_MISMATCH;
        }
-       slen = SVAL(dir_data + 68, 0);
+       slen = CVAL(dir_data + 68, 0);
        if (slen > 24) {
                return NT_STATUS_INFO_LENGTH_MISMATCH;
        }
@@ -486,6 +714,7 @@ static bool windows_parent_dirname(TALLOC_CTX *mem_ctx,
 
 NTSTATUS cli_smb2_list(struct cli_state *cli,
                        const char *pathname,
+                       uint16_t attribute,
                        NTSTATUS (*fn)(const char *,
                                struct file_info *,
                                const char *,
@@ -497,8 +726,10 @@ NTSTATUS cli_smb2_list(struct cli_state *cli,
        char *parent_dir = NULL;
        const char *mask = NULL;
        struct smb2_hnd *ph = NULL;
+       bool processed_file = false;
        TALLOC_CTX *frame = talloc_stackframe();
        TALLOC_CTX *subframe = NULL;
+       bool mask_has_wild;
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
                /*
@@ -522,6 +753,8 @@ NTSTATUS cli_smb2_list(struct cli_state *cli,
                goto fail;
         }
 
+       mask_has_wild = ms_has_wild(mask);
+
        status = cli_smb2_create_fnum(cli,
                        parent_dir,
                        0,                      /* create_flags */
@@ -590,13 +823,26 @@ NTSTATUS cli_smb2_list(struct cli_state *cli,
                                goto fail;
                        }
 
-                       status = fn(cli->dfs_mountpoint,
+                       if (dir_check_ftype((uint32_t)finfo->mode,
+                                       (uint32_t)attribute)) {
+                               /*
+                                * Only process if attributes match.
+                                * On SMB1 server does this, so on
+                                * SMB2 we need to emulate in the
+                                * client.
+                                *
+                                * https://bugzilla.samba.org/show_bug.cgi?id=10260
+                                */
+                               processed_file = true;
+
+                               status = fn(cli->dfs_mountpoint,
                                        finfo,
                                        pathname,
                                        state);
 
-                       if (!NT_STATUS_IS_OK(status)) {
-                               break;
+                               if (!NT_STATUS_IS_OK(status)) {
+                                       break;
+                               }
                        }
 
                        TALLOC_FREE(finfo);
@@ -610,17 +856,39 @@ NTSTATUS cli_smb2_list(struct cli_state *cli,
 
                TALLOC_FREE(subframe);
 
+               if (!mask_has_wild) {
+                       /*
+                        * MacOSX 10 doesn't set STATUS_NO_MORE_FILES
+                        * when handed a non-wildcard path. Do it
+                        * for the server (with a non-wildcard path
+                        * there should only ever be one file returned.
+                        */
+                       status = STATUS_NO_MORE_FILES;
+                       break;
+               }
+
        } while (NT_STATUS_IS_OK(status));
 
        if (NT_STATUS_EQUAL(status, STATUS_NO_MORE_FILES)) {
                status = NT_STATUS_OK;
        }
 
+       if (NT_STATUS_IS_OK(status) && !processed_file) {
+               /*
+                * In SMB1 findfirst returns NT_STATUS_NO_SUCH_FILE
+                * if no files match. Emulate this in the client.
+                */
+               status = NT_STATUS_NO_SUCH_FILE;
+       }
+
   fail:
 
        if (fnum != 0xffff) {
                cli_smb2_close_fnum(cli, fnum);
        }
+
+       cli->raw_status = status;
+
        TALLOC_FREE(subframe);
        TALLOC_FREE(frame);
        return status;
@@ -637,7 +905,7 @@ NTSTATUS cli_smb2_qpathinfo_basic(struct cli_state *cli,
                                uint32_t *attributes)
 {
        NTSTATUS status;
-       struct smb2_create_returns cr;
+       struct smb_create_returns cr;
        uint16_t fnum = 0xffff;
        size_t namelen = strlen(name);
 
@@ -692,17 +960,17 @@ NTSTATUS cli_smb2_qpathinfo_basic(struct cli_state *cli,
                return status;
        }
 
-       cli_smb2_close_fnum(cli, fnum);
+       status = cli_smb2_close_fnum(cli, fnum);
 
        ZERO_STRUCTP(sbuf);
 
-       sbuf->st_ex_atime = nt_time_to_unix_timespec(&cr.last_access_time);
-       sbuf->st_ex_mtime = nt_time_to_unix_timespec(&cr.last_write_time);
-       sbuf->st_ex_ctime = nt_time_to_unix_timespec(&cr.change_time);
+       sbuf->st_ex_atime = nt_time_to_unix_timespec(cr.last_access_time);
+       sbuf->st_ex_mtime = nt_time_to_unix_timespec(cr.last_write_time);
+       sbuf->st_ex_ctime = nt_time_to_unix_timespec(cr.change_time);
        sbuf->st_ex_size = cr.end_of_file;
        *attributes = cr.file_attributes;
 
-       return NT_STATUS_OK;
+       return status;
 }
 
 /***************************************************************
@@ -868,6 +1136,9 @@ NTSTATUS cli_smb2_qpathinfo_alt_name(struct cli_state *cli,
        if (fnum != 0xffff) {
                cli_smb2_close_fnum(cli, fnum);
        }
+
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -967,6 +1238,8 @@ NTSTATUS cli_smb2_qfileinfo_basic(struct cli_state *cli,
 
   fail:
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -998,6 +1271,8 @@ NTSTATUS cli_smb2_getattrE(struct cli_state *cli,
                                        &change_time_ts,
                                         NULL);
 
+       cli->raw_status = status;
+
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -1075,6 +1350,8 @@ NTSTATUS cli_smb2_getatr(struct cli_state *cli,
                cli_smb2_close_fnum(cli, fnum);
        }
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -1145,6 +1422,8 @@ NTSTATUS cli_smb2_qpathinfo2(struct cli_state *cli,
                cli_smb2_close_fnum(cli, fnum);
        }
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -1233,6 +1512,8 @@ NTSTATUS cli_smb2_qpathinfo_streams(struct cli_state *cli,
                cli_smb2_close_fnum(cli, fnum);
        }
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -1290,7 +1571,7 @@ NTSTATUS cli_smb2_setatr(struct cli_state *cli,
        inbuf.length = sizeof(inbuf_store);
        data_blob_clear(&inbuf);
 
-       SIVAL(inbuf.data,32,attr);
+       SSVAL(inbuf.data, 32, attr);
        if (mtime != 0) {
                put_long_date((char *)inbuf.data + 16,mtime);
        }
@@ -1315,6 +1596,8 @@ NTSTATUS cli_smb2_setatr(struct cli_state *cli,
                cli_smb2_close_fnum(cli, fnum);
        }
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -1371,7 +1654,7 @@ NTSTATUS cli_smb2_setattrE(struct cli_state *cli,
                put_long_date((char *)inbuf.data + 16, write_time);
        }
 
-       return smb2cli_set_info(cli->conn,
+       cli->raw_status = smb2cli_set_info(cli->conn,
                                cli->timeout,
                                cli->smb2.session,
                                cli->smb2.tcon,
@@ -1381,6 +1664,8 @@ NTSTATUS cli_smb2_setattrE(struct cli_state *cli,
                                0, /* in_additional_info */
                                ph->fid_persistent,
                                ph->fid_volatile);
+
+       return cli->raw_status;
 }
 
 /***************************************************************
@@ -1388,7 +1673,8 @@ NTSTATUS cli_smb2_setattrE(struct cli_state *cli,
  Synchronous only.
 ***************************************************************/
 
-NTSTATUS cli_smb2_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail)
+NTSTATUS cli_smb2_dskattr(struct cli_state *cli, const char *path,
+                         uint64_t *bsize, uint64_t *total, uint64_t *avail)
 {
        NTSTATUS status;
        uint16_t fnum = 0xffff;
@@ -1415,7 +1701,7 @@ NTSTATUS cli_smb2_dskattr(struct cli_state *cli, int *bsize, int *total, int *av
 
        /* First open the top level directory. */
        status = cli_smb2_create_fnum(cli,
-                       "",
+                       path,
                        0,                      /* create_flags */
                        FILE_READ_ATTRIBUTES,   /* desired_access */
                        FILE_ATTRIBUTE_DIRECTORY, /* file attributes */
@@ -1469,13 +1755,13 @@ NTSTATUS cli_smb2_dskattr(struct cli_state *cli, int *bsize, int *total, int *av
        bytes_per_sector = IVAL(outbuf.data, 20);
 
        if (bsize) {
-               *bsize = (int)(sectors_per_unit * bytes_per_sector);
+               *bsize = (uint64_t)sectors_per_unit * (uint64_t)bytes_per_sector;
        }
        if (total) {
-               *total = (int)total_size;
+               *total = total_size;
        }
        if (avail) {
-               *avail = (int)size_free;
+               *avail = size_free;
        }
 
        status = NT_STATUS_OK;
@@ -1486,25 +1772,23 @@ NTSTATUS cli_smb2_dskattr(struct cli_state *cli, int *bsize, int *total, int *av
                cli_smb2_close_fnum(cli, fnum);
        }
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
 
 /***************************************************************
- Wrapper that allows SMB2 to query a security descriptor.
+ Wrapper that allows SMB2 to query file system attributes.
  Synchronous only.
 ***************************************************************/
 
-NTSTATUS cli_smb2_query_security_descriptor(struct cli_state *cli,
-                                       uint16_t fnum,
-                                       uint32_t sec_info,
-                                       TALLOC_CTX *mem_ctx,
-                                       struct security_descriptor **ppsd)
+NTSTATUS cli_smb2_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr)
 {
        NTSTATUS status;
+       uint16_t fnum = 0xffff;
        DATA_BLOB outbuf = data_blob_null;
        struct smb2_hnd *ph = NULL;
-       struct security_descriptor *lsd = NULL;
        TALLOC_CTX *frame = talloc_stackframe();
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
@@ -1520,62 +1804,147 @@ NTSTATUS cli_smb2_query_security_descriptor(struct cli_state *cli,
                goto fail;
        }
 
-       status = map_fnum_to_smb2_handle(cli,
-                                       fnum,
-                                       &ph);
+       /* First open the top level directory. */
+       status =
+           cli_smb2_create_fnum(cli, "", 0,               /* create_flags */
+                                FILE_READ_ATTRIBUTES,     /* desired_access */
+                                FILE_ATTRIBUTE_DIRECTORY, /* file attributes */
+                                FILE_SHARE_READ | FILE_SHARE_WRITE |
+                                    FILE_SHARE_DELETE, /* share_access */
+                                FILE_OPEN,             /* create_disposition */
+                                FILE_DIRECTORY_FILE,   /* create_options */
+                                &fnum,
+                                NULL);
+
        if (!NT_STATUS_IS_OK(status)) {
                goto fail;
        }
 
-       /* getinfo on the returned handle with info_type SMB2_GETINFO_SEC (3) */
-
-       status = smb2cli_query_info(cli->conn,
-                               cli->timeout,
-                               cli->smb2.session,
-                               cli->smb2.tcon,
-                               3, /* in_info_type */
-                               0, /* in_file_info_class */
-                               0xFFFF, /* in_max_output_length */
-                               NULL, /* in_input_buffer */
-                               sec_info, /* in_additional_info */
-                               0, /* in_flags */
-                               ph->fid_persistent,
-                               ph->fid_volatile,
-                               frame,
-                               &outbuf);
-
+       status = map_fnum_to_smb2_handle(cli, fnum, &ph);
        if (!NT_STATUS_IS_OK(status)) {
                goto fail;
        }
 
-       /* Parse the reply. */
-       status = unmarshall_sec_desc(mem_ctx,
-                               outbuf.data,
-                               outbuf.length,
-                               &lsd);
-
+       status = smb2cli_query_info(cli->conn, cli->timeout, cli->smb2.session,
+                                   cli->smb2.tcon, 2, /* in_info_type */
+                                   5,                 /* in_file_info_class */
+                                   0xFFFF, /* in_max_output_length */
+                                   NULL,   /* in_input_buffer */
+                                   0,      /* in_additional_info */
+                                   0,      /* in_flags */
+                                   ph->fid_persistent, ph->fid_volatile, frame,
+                                   &outbuf);
        if (!NT_STATUS_IS_OK(status)) {
                goto fail;
        }
 
-       if (ppsd != NULL) {
-               *ppsd = lsd;
-       } else {
-               TALLOC_FREE(lsd);
+       if (outbuf.length < 12) {
+               status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+               goto fail;
        }
 
-  fail:
+       *fs_attr = IVAL(outbuf.data, 0);
+
+fail:
+
+       if (fnum != 0xffff) {
+               cli_smb2_close_fnum(cli, fnum);
+       }
+
+       cli->raw_status = status;
 
        TALLOC_FREE(frame);
        return status;
 }
 
 /***************************************************************
- Wrapper that allows SMB2 to set a security descriptor.
+ Wrapper that allows SMB2 to query a security descriptor.
  Synchronous only.
 ***************************************************************/
 
-NTSTATUS cli_smb2_set_security_descriptor(struct cli_state *cli,
+NTSTATUS cli_smb2_query_security_descriptor(struct cli_state *cli,
+                                       uint16_t fnum,
+                                       uint32_t sec_info,
+                                       TALLOC_CTX *mem_ctx,
+                                       struct security_descriptor **ppsd)
+{
+       NTSTATUS status;
+       DATA_BLOB outbuf = data_blob_null;
+       struct smb2_hnd *ph = NULL;
+       struct security_descriptor *lsd = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+
+       status = map_fnum_to_smb2_handle(cli,
+                                       fnum,
+                                       &ph);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       /* getinfo on the returned handle with info_type SMB2_GETINFO_SEC (3) */
+
+       status = smb2cli_query_info(cli->conn,
+                               cli->timeout,
+                               cli->smb2.session,
+                               cli->smb2.tcon,
+                               3, /* in_info_type */
+                               0, /* in_file_info_class */
+                               0xFFFF, /* in_max_output_length */
+                               NULL, /* in_input_buffer */
+                               sec_info, /* in_additional_info */
+                               0, /* in_flags */
+                               ph->fid_persistent,
+                               ph->fid_volatile,
+                               frame,
+                               &outbuf);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       /* Parse the reply. */
+       status = unmarshall_sec_desc(mem_ctx,
+                               outbuf.data,
+                               outbuf.length,
+                               &lsd);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       if (ppsd != NULL) {
+               *ppsd = lsd;
+       } else {
+               TALLOC_FREE(lsd);
+       }
+
+  fail:
+
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+       return status;
+}
+
+/***************************************************************
+ Wrapper that allows SMB2 to set a security descriptor.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_set_security_descriptor(struct cli_state *cli,
                                        uint16_t fnum,
                                        uint32_t sec_info,
                                        const struct security_descriptor *sd)
@@ -1629,6 +1998,8 @@ NTSTATUS cli_smb2_set_security_descriptor(struct cli_state *cli,
 
   fail:
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -1639,8 +2010,9 @@ NTSTATUS cli_smb2_set_security_descriptor(struct cli_state *cli,
 ***************************************************************/
 
 NTSTATUS cli_smb2_rename(struct cli_state *cli,
-                       const char *fname_src,
-                       const char *fname_dst)
+                        const char *fname_src,
+                        const char *fname_dst,
+                        bool replace)
 {
        NTSTATUS status;
        DATA_BLOB inbuf = data_blob_null;
@@ -1720,6 +2092,10 @@ NTSTATUS cli_smb2_rename(struct cli_state *cli,
                goto fail;
        }
 
+       if (replace) {
+               SCVAL(inbuf.data, 0, 1);
+       }
+
        SIVAL(inbuf.data, 16, converted_size_bytes);
        memcpy(inbuf.data + 20, converted_str, converted_size_bytes);
 
@@ -1743,6 +2119,8 @@ NTSTATUS cli_smb2_rename(struct cli_state *cli,
                cli_smb2_close_fnum(cli, fnum);
        }
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -1836,6 +2214,8 @@ NTSTATUS cli_smb2_set_ea_fnum(struct cli_state *cli,
 
   fail:
 
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
@@ -1891,6 +2271,8 @@ NTSTATUS cli_smb2_set_ea_path(struct cli_state *cli,
                cli_smb2_close_fnum(cli, fnum);
        }
 
+       cli->raw_status = status;
+
        return status;
 }
 
@@ -1990,159 +2372,371 @@ NTSTATUS cli_smb2_get_ea_list_path(struct cli_state *cli,
                }
                ea_count = 0;
                for (eal = ea_list; eal; eal = eal->next) {
-                       (*pea_array)[ea_count++] = ea_list->ea;
+                       (*pea_array)[ea_count++] = eal->ea;
                }
                *pnum_eas = ea_count;
        }
 
   fail:
 
+       if (fnum != 0xffff) {
+               cli_smb2_close_fnum(cli, fnum);
+       }
+
+       cli->raw_status = status;
+
        TALLOC_FREE(frame);
        return status;
 }
 
-struct cli_smb2_read_state {
-       struct tevent_context *ev;
-       struct cli_state *cli;
-       struct smb2_hnd *ph;
-       uint64_t start_offset;
-       uint32_t size;
-       uint32_t received;
-       uint8_t *buf;
-};
-
-static void cli_smb2_read_done(struct tevent_req *subreq);
+/***************************************************************
+ Wrapper that allows SMB2 to get user quota.
+ Synchronous only.
+***************************************************************/
 
-struct tevent_req *cli_smb2_read_send(TALLOC_CTX *mem_ctx,
-                               struct tevent_context *ev,
-                               struct cli_state *cli,
-                               uint16_t fnum,
-                               off_t offset,
-                               size_t size)
+NTSTATUS cli_smb2_get_user_quota(struct cli_state *cli,
+                                int quota_fnum,
+                                SMB_NTQUOTA_STRUCT *pqt)
 {
        NTSTATUS status;
-       struct tevent_req *req, *subreq;
-       struct cli_smb2_read_state *state;
+       DATA_BLOB inbuf = data_blob_null;
+       DATA_BLOB outbuf = data_blob_null;
+       struct smb2_hnd *ph = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+       unsigned sid_len;
+       unsigned int offset;
+       uint8_t *buf;
 
-       req = tevent_req_create(mem_ctx, &state, struct cli_smb2_read_state);
-       if (req == NULL) {
-               return NULL;
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
        }
-       state->ev = ev;
-       state->cli = cli;
-       state->start_offset = (uint64_t)offset;
-       state->size = (uint32_t)size;
-       state->received = 0;
-       state->buf = NULL;
 
-       status = map_fnum_to_smb2_handle(cli,
-                                       fnum,
-                                       &state->ph);
-       if (tevent_req_nterror(req, status)) {
-               return tevent_req_post(req, ev);
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
        }
 
-       subreq = smb2cli_read_send(state,
-                               state->ev,
-                               state->cli->conn,
-                               state->cli->timeout,
-                               state->cli->smb2.session,
-                               state->cli->smb2.tcon,
-                               state->size,
-                               state->start_offset,
-                               state->ph->fid_persistent,
-                               state->ph->fid_volatile,
-                               0, /* minimum_count */
-                               0); /* remaining_bytes */
-
-       if (tevent_req_nomem(subreq, req)) {
-               return tevent_req_post(req, ev);
+       status = map_fnum_to_smb2_handle(cli, quota_fnum, &ph);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
        }
-       tevent_req_set_callback(subreq, cli_smb2_read_done, req);
-       return req;
-}
 
-static void cli_smb2_read_done(struct tevent_req *subreq)
-{
-       struct tevent_req *req = tevent_req_callback_data(
-               subreq, struct tevent_req);
-       struct cli_smb2_read_state *state = tevent_req_data(
-               req, struct cli_smb2_read_state);
-       NTSTATUS status;
+       sid_len = ndr_size_dom_sid(&pqt->sid, 0);
 
-       status = smb2cli_read_recv(subreq, state,
-                                  &state->buf, &state->received);
-       if (tevent_req_nterror(req, status)) {
-               return;
+       inbuf = data_blob_talloc_zero(frame, 24 + sid_len);
+       if (inbuf.data == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
        }
 
-       if (state->received > state->size) {
-               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-               return;
+       buf = inbuf.data;
+
+       SCVAL(buf, 0, 1);          /* ReturnSingle */
+       SCVAL(buf, 1, 0);          /* RestartScan */
+       SSVAL(buf, 2, 0);          /* Reserved */
+       if (8 + sid_len < 8) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
        }
+       SIVAL(buf, 4, 8 + sid_len); /* SidListLength */
+       SIVAL(buf, 8, 0);          /* StartSidLength */
+       SIVAL(buf, 12, 0);        /* StartSidOffset */
+       SIVAL(buf, 16, 0);        /* NextEntryOffset */
+       SIVAL(buf, 20, sid_len);    /* SidLength */
+       sid_linearize(buf + 24, sid_len, &pqt->sid);
 
-       tevent_req_done(req);
-}
+       status = smb2cli_query_info(cli->conn, cli->timeout, cli->smb2.session,
+                                   cli->smb2.tcon, 4, /* in_info_type */
+                                   0,                 /* in_file_info_class */
+                                   0xFFFF, /* in_max_output_length */
+                                   &inbuf, /* in_input_buffer */
+                                   0,      /* in_additional_info */
+                                   0,      /* in_flags */
+                                   ph->fid_persistent, ph->fid_volatile, frame,
+                                   &outbuf);
 
-NTSTATUS cli_smb2_read_recv(struct tevent_req *req,
-                               ssize_t *received,
-                               uint8_t **rcvbuf)
-{
-       NTSTATUS status;
-       struct cli_smb2_read_state *state = tevent_req_data(
-                               req, struct cli_smb2_read_state);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
 
-       if (tevent_req_is_nterror(req, &status)) {
-               return status;
+       if (!parse_user_quota_record(outbuf.data, outbuf.length, &offset,
+                                    pqt)) {
+               status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+               DEBUG(0, ("Got invalid FILE_QUOTA_INFORMATION in reply.\n"));
        }
-       /*
-        * As in cli_read_andx_recv() rcvbuf is talloced from the request, so
-        * better make sure that you copy it away before you talloc_free(req).
-        * "rcvbuf" is NOT a talloc_ctx of its own, so do not talloc_move it!
-        */
-       *received = (ssize_t)state->received;
-       *rcvbuf = state->buf;
-       return NT_STATUS_OK;
-}
 
-struct cli_smb2_write_state {
-       struct tevent_context *ev;
-       struct cli_state *cli;
-       struct smb2_hnd *ph;
-       uint32_t flags;
-       const uint8_t *buf;
-       uint64_t offset;
-       uint32_t size;
-       uint32_t written;
-};
+fail:
+       cli->raw_status = status;
 
-static void cli_smb2_write_written(struct tevent_req *req);
+       TALLOC_FREE(frame);
+       return status;
+}
 
-struct tevent_req *cli_smb2_write_send(TALLOC_CTX *mem_ctx,
-                                       struct tevent_context *ev,
-                                       struct cli_state *cli,
-                                       uint16_t fnum,
-                                       uint16_t mode,
-                                       const uint8_t *buf,
-                                       off_t offset,
-                                       size_t size)
+/***************************************************************
+ Wrapper that allows SMB2 to list user quota.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_list_user_quota_step(struct cli_state *cli,
+                                      TALLOC_CTX *mem_ctx,
+                                      int quota_fnum,
+                                      SMB_NTQUOTA_LIST **pqt_list,
+                                      bool first)
 {
        NTSTATUS status;
-       struct tevent_req *req, *subreq = NULL;
-       struct cli_smb2_write_state *state = NULL;
+       DATA_BLOB inbuf = data_blob_null;
+       DATA_BLOB outbuf = data_blob_null;
+       struct smb2_hnd *ph = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+       uint8_t *buf;
 
-       req = tevent_req_create(mem_ctx, &state, struct cli_smb2_write_state);
-       if (req == NULL) {
-               return NULL;
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto cleanup;
        }
-       state->ev = ev;
-       state->cli = cli;
-       /* Both SMB1 and SMB2 use 1 in the following meaning write-through. */
-       state->flags = (uint32_t)mode;
-       state->buf = buf;
-       state->offset = (uint64_t)offset;
-       state->size = (uint32_t)size;
-       state->written = 0;
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto cleanup;
+       }
+
+       status = map_fnum_to_smb2_handle(cli, quota_fnum, &ph);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cleanup;
+       }
+
+       inbuf = data_blob_talloc_zero(frame, 16);
+       if (inbuf.data == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto cleanup;
+       }
+
+       buf = inbuf.data;
+
+       SCVAL(buf, 0, 0);            /* ReturnSingle */
+       SCVAL(buf, 1, first ? 1 : 0); /* RestartScan */
+       SSVAL(buf, 2, 0);            /* Reserved */
+       SIVAL(buf, 4, 0);            /* SidListLength */
+       SIVAL(buf, 8, 0);            /* StartSidLength */
+       SIVAL(buf, 12, 0);          /* StartSidOffset */
+
+       status = smb2cli_query_info(cli->conn, cli->timeout, cli->smb2.session,
+                                   cli->smb2.tcon, 4, /* in_info_type */
+                                   0,                 /* in_file_info_class */
+                                   0xFFFF, /* in_max_output_length */
+                                   &inbuf, /* in_input_buffer */
+                                   0,      /* in_additional_info */
+                                   0,      /* in_flags */
+                                   ph->fid_persistent, ph->fid_volatile, frame,
+                                   &outbuf);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cleanup;
+       }
+
+       status = parse_user_quota_list(outbuf.data, outbuf.length, mem_ctx,
+                                      pqt_list);
+
+cleanup:
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+       return status;
+}
+
+/***************************************************************
+ Wrapper that allows SMB2 to get file system quota.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_get_fs_quota_info(struct cli_state *cli,
+                                   int quota_fnum,
+                                   SMB_NTQUOTA_STRUCT *pqt)
+{
+       NTSTATUS status;
+       DATA_BLOB outbuf = data_blob_null;
+       struct smb2_hnd *ph = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto cleanup;
+       }
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto cleanup;
+       }
+
+       status = map_fnum_to_smb2_handle(cli, quota_fnum, &ph);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cleanup;
+       }
+
+       status = smb2cli_query_info(
+           cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
+           2,                               /* in_info_type */
+           SMB_FS_QUOTA_INFORMATION - 1000, /* in_file_info_class */
+           0xFFFF,                          /* in_max_output_length */
+           NULL,                            /* in_input_buffer */
+           0,                               /* in_additional_info */
+           0,                               /* in_flags */
+           ph->fid_persistent, ph->fid_volatile, frame, &outbuf);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cleanup;
+       }
+
+       status = parse_fs_quota_buffer(outbuf.data, outbuf.length, pqt);
+
+cleanup:
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+       return status;
+}
+
+/***************************************************************
+ Wrapper that allows SMB2 to set user quota.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_set_user_quota(struct cli_state *cli,
+                                int quota_fnum,
+                                SMB_NTQUOTA_LIST *qtl)
+{
+       NTSTATUS status;
+       DATA_BLOB inbuf = data_blob_null;
+       struct smb2_hnd *ph = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto cleanup;
+       }
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto cleanup;
+       }
+
+       status = map_fnum_to_smb2_handle(cli, quota_fnum, &ph);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cleanup;
+       }
+
+       status = build_user_quota_buffer(qtl, 0, talloc_tos(), &inbuf, NULL);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cleanup;
+       }
+
+       status = smb2cli_set_info(cli->conn, cli->timeout, cli->smb2.session,
+                                 cli->smb2.tcon, 4, /* in_info_type */
+                                 0,                 /* in_file_info_class */
+                                 &inbuf,           /* in_input_buffer */
+                                 0,                 /* in_additional_info */
+                                 ph->fid_persistent, ph->fid_volatile);
+cleanup:
+
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+
+       return status;
+}
+
+NTSTATUS cli_smb2_set_fs_quota_info(struct cli_state *cli,
+                                   int quota_fnum,
+                                   SMB_NTQUOTA_STRUCT *pqt)
+{
+       NTSTATUS status;
+       DATA_BLOB inbuf = data_blob_null;
+       struct smb2_hnd *ph = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto cleanup;
+       }
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto cleanup;
+       }
+
+       status = map_fnum_to_smb2_handle(cli, quota_fnum, &ph);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cleanup;
+       }
+
+       status = build_fs_quota_buffer(talloc_tos(), pqt, &inbuf, 0);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cleanup;
+       }
+
+       status = smb2cli_set_info(
+           cli->conn, cli->timeout, cli->smb2.session, cli->smb2.tcon,
+           2,                               /* in_info_type */
+           SMB_FS_QUOTA_INFORMATION - 1000, /* in_file_info_class */
+           &inbuf,                          /* in_input_buffer */
+           0,                               /* in_additional_info */
+           ph->fid_persistent, ph->fid_volatile);
+cleanup:
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+       return status;
+}
+
+struct cli_smb2_read_state {
+       struct tevent_context *ev;
+       struct cli_state *cli;
+       struct smb2_hnd *ph;
+       uint64_t start_offset;
+       uint32_t size;
+       uint32_t received;
+       uint8_t *buf;
+};
+
+static void cli_smb2_read_done(struct tevent_req *subreq);
+
+struct tevent_req *cli_smb2_read_send(TALLOC_CTX *mem_ctx,
+                               struct tevent_context *ev,
+                               struct cli_state *cli,
+                               uint16_t fnum,
+                               off_t offset,
+                               size_t size)
+{
+       NTSTATUS status;
+       struct tevent_req *req, *subreq;
+       struct cli_smb2_read_state *state;
+
+       req = tevent_req_create(mem_ctx, &state, struct cli_smb2_read_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->cli = cli;
+       state->start_offset = (uint64_t)offset;
+       state->size = (uint32_t)size;
+       state->received = 0;
+       state->buf = NULL;
 
        status = map_fnum_to_smb2_handle(cli,
                                        fnum,
@@ -2151,76 +2745,72 @@ struct tevent_req *cli_smb2_write_send(TALLOC_CTX *mem_ctx,
                return tevent_req_post(req, ev);
        }
 
-       subreq = smb2cli_write_send(state,
+       subreq = smb2cli_read_send(state,
                                state->ev,
                                state->cli->conn,
                                state->cli->timeout,
                                state->cli->smb2.session,
                                state->cli->smb2.tcon,
                                state->size,
-                               state->offset,
+                               state->start_offset,
                                state->ph->fid_persistent,
                                state->ph->fid_volatile,
-                               0, /* remaining_bytes */
-                               state->flags, /* flags */
-                               state->buf);
+                               0, /* minimum_count */
+                               0); /* remaining_bytes */
 
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       tevent_req_set_callback(subreq, cli_smb2_write_written, req);
+       tevent_req_set_callback(subreq, cli_smb2_read_done, req);
        return req;
 }
 
-static void cli_smb2_write_written(struct tevent_req *subreq)
+static void cli_smb2_read_done(struct tevent_req *subreq)
 {
        struct tevent_req *req = tevent_req_callback_data(
                subreq, struct tevent_req);
-       struct cli_smb2_write_state *state = tevent_req_data(
-               req, struct cli_smb2_write_state);
-        NTSTATUS status;
-       uint32_t written;
+       struct cli_smb2_read_state *state = tevent_req_data(
+               req, struct cli_smb2_read_state);
+       NTSTATUS status;
 
-       status = smb2cli_write_recv(subreq, &written);
-       TALLOC_FREE(subreq);
+       status = smb2cli_read_recv(subreq, state,
+                                  &state->buf, &state->received);
        if (tevent_req_nterror(req, status)) {
                return;
        }
 
-       state->written = written;
+       if (state->received > state->size) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
 
        tevent_req_done(req);
 }
 
-NTSTATUS cli_smb2_write_recv(struct tevent_req *req,
-                            size_t *pwritten)
+NTSTATUS cli_smb2_read_recv(struct tevent_req *req,
+                               ssize_t *received,
+                               uint8_t **rcvbuf)
 {
-       struct cli_smb2_write_state *state = tevent_req_data(
-               req, struct cli_smb2_write_state);
        NTSTATUS status;
+       struct cli_smb2_read_state *state = tevent_req_data(
+                               req, struct cli_smb2_read_state);
 
        if (tevent_req_is_nterror(req, &status)) {
-               tevent_req_received(req);
+               state->cli->raw_status = status;
                return status;
        }
-
-       if (pwritten != NULL) {
-               *pwritten = (size_t)state->written;
-       }
-       tevent_req_received(req);
+       /*
+        * As in cli_read_andx_recv() rcvbuf is talloced from the request, so
+        * better make sure that you copy it away before you talloc_free(req).
+        * "rcvbuf" is NOT a talloc_ctx of its own, so do not talloc_move it!
+        */
+       *received = (ssize_t)state->received;
+       *rcvbuf = state->buf;
+       state->cli->raw_status = NT_STATUS_OK;
        return NT_STATUS_OK;
 }
 
-/***************************************************************
- Wrapper that allows SMB2 async write using an fnum.
- This is mostly cut-and-paste from Volker's code inside
- source3/libsmb/clireadwrite.c, adapted for SMB2.
-
- Done this way so I can reuse all the logic inside cli_push()
- for free :-).
-***************************************************************/
-
-struct cli_smb2_writeall_state {
+struct cli_smb2_write_state {
        struct tevent_context *ev;
        struct cli_state *cli;
        struct smb2_hnd *ph;
@@ -2231,9 +2821,9 @@ struct cli_smb2_writeall_state {
        uint32_t written;
 };
 
-static void cli_smb2_writeall_written(struct tevent_req *req);
+static void cli_smb2_write_written(struct tevent_req *req);
 
-struct tevent_req *cli_smb2_writeall_send(TALLOC_CTX *mem_ctx,
+struct tevent_req *cli_smb2_write_send(TALLOC_CTX *mem_ctx,
                                        struct tevent_context *ev,
                                        struct cli_state *cli,
                                        uint16_t fnum,
@@ -2244,12 +2834,9 @@ struct tevent_req *cli_smb2_writeall_send(TALLOC_CTX *mem_ctx,
 {
        NTSTATUS status;
        struct tevent_req *req, *subreq = NULL;
-       struct cli_smb2_writeall_state *state = NULL;
-       uint32_t to_write;
-       uint32_t max_size;
-       bool ok;
+       struct cli_smb2_write_state *state = NULL;
 
-       req = tevent_req_create(mem_ctx, &state, struct cli_smb2_writeall_state);
+       req = tevent_req_create(mem_ctx, &state, struct cli_smb2_write_state);
        if (req == NULL) {
                return NULL;
        }
@@ -2269,45 +2856,35 @@ struct tevent_req *cli_smb2_writeall_send(TALLOC_CTX *mem_ctx,
                return tevent_req_post(req, ev);
        }
 
-       to_write = state->size;
-       max_size = smb2cli_conn_max_write_size(state->cli->conn);
-       to_write = MIN(max_size, to_write);
-       ok = smb2cli_conn_req_possible(state->cli->conn, &max_size);
-       if (ok) {
-               to_write = MIN(max_size, to_write);
-       }
-
        subreq = smb2cli_write_send(state,
                                state->ev,
                                state->cli->conn,
                                state->cli->timeout,
                                state->cli->smb2.session,
                                state->cli->smb2.tcon,
-                               to_write,
+                               state->size,
                                state->offset,
                                state->ph->fid_persistent,
                                state->ph->fid_volatile,
                                0, /* remaining_bytes */
                                state->flags, /* flags */
-                               state->buf + state->written);
+                               state->buf);
 
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       tevent_req_set_callback(subreq, cli_smb2_writeall_written, req);
+       tevent_req_set_callback(subreq, cli_smb2_write_written, req);
        return req;
 }
 
-static void cli_smb2_writeall_written(struct tevent_req *subreq)
+static void cli_smb2_write_written(struct tevent_req *subreq)
 {
        struct tevent_req *req = tevent_req_callback_data(
                subreq, struct tevent_req);
-       struct cli_smb2_writeall_state *state = tevent_req_data(
-               req, struct cli_smb2_writeall_state);
+       struct cli_smb2_write_state *state = tevent_req_data(
+               req, struct cli_smb2_write_state);
         NTSTATUS status;
-       uint32_t written, to_write;
-       uint32_t max_size;
-       bool ok;
+       uint32_t written;
 
        status = smb2cli_write_recv(subreq, &written);
        TALLOC_FREE(subreq);
@@ -2315,12 +2892,142 @@ static void cli_smb2_writeall_written(struct tevent_req *subreq)
                return;
        }
 
-       state->written += written;
+       state->written = written;
 
-       if (state->written > state->size) {
-               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
-               return;
-       }
+       tevent_req_done(req);
+}
+
+NTSTATUS cli_smb2_write_recv(struct tevent_req *req,
+                            size_t *pwritten)
+{
+       struct cli_smb2_write_state *state = tevent_req_data(
+               req, struct cli_smb2_write_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
+               tevent_req_received(req);
+               return status;
+       }
+
+       if (pwritten != NULL) {
+               *pwritten = (size_t)state->written;
+       }
+       state->cli->raw_status = NT_STATUS_OK;
+       tevent_req_received(req);
+       return NT_STATUS_OK;
+}
+
+/***************************************************************
+ Wrapper that allows SMB2 async write using an fnum.
+ This is mostly cut-and-paste from Volker's code inside
+ source3/libsmb/clireadwrite.c, adapted for SMB2.
+
+ Done this way so I can reuse all the logic inside cli_push()
+ for free :-).
+***************************************************************/
+
+struct cli_smb2_writeall_state {
+       struct tevent_context *ev;
+       struct cli_state *cli;
+       struct smb2_hnd *ph;
+       uint32_t flags;
+       const uint8_t *buf;
+       uint64_t offset;
+       uint32_t size;
+       uint32_t written;
+};
+
+static void cli_smb2_writeall_written(struct tevent_req *req);
+
+struct tevent_req *cli_smb2_writeall_send(TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       struct cli_state *cli,
+                                       uint16_t fnum,
+                                       uint16_t mode,
+                                       const uint8_t *buf,
+                                       off_t offset,
+                                       size_t size)
+{
+       NTSTATUS status;
+       struct tevent_req *req, *subreq = NULL;
+       struct cli_smb2_writeall_state *state = NULL;
+       uint32_t to_write;
+       uint32_t max_size;
+       bool ok;
+
+       req = tevent_req_create(mem_ctx, &state, struct cli_smb2_writeall_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->ev = ev;
+       state->cli = cli;
+       /* Both SMB1 and SMB2 use 1 in the following meaning write-through. */
+       state->flags = (uint32_t)mode;
+       state->buf = buf;
+       state->offset = (uint64_t)offset;
+       state->size = (uint32_t)size;
+       state->written = 0;
+
+       status = map_fnum_to_smb2_handle(cli,
+                                       fnum,
+                                       &state->ph);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
+       }
+
+       to_write = state->size;
+       max_size = smb2cli_conn_max_write_size(state->cli->conn);
+       to_write = MIN(max_size, to_write);
+       ok = smb2cli_conn_req_possible(state->cli->conn, &max_size);
+       if (ok) {
+               to_write = MIN(max_size, to_write);
+       }
+
+       subreq = smb2cli_write_send(state,
+                               state->ev,
+                               state->cli->conn,
+                               state->cli->timeout,
+                               state->cli->smb2.session,
+                               state->cli->smb2.tcon,
+                               to_write,
+                               state->offset,
+                               state->ph->fid_persistent,
+                               state->ph->fid_volatile,
+                               0, /* remaining_bytes */
+                               state->flags, /* flags */
+                               state->buf + state->written);
+
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, cli_smb2_writeall_written, req);
+       return req;
+}
+
+static void cli_smb2_writeall_written(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb2_writeall_state *state = tevent_req_data(
+               req, struct cli_smb2_writeall_state);
+        NTSTATUS status;
+       uint32_t written, to_write;
+       uint32_t max_size;
+       bool ok;
+
+       status = smb2cli_write_recv(subreq, &written);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       state->written += written;
+
+       if (state->written > state->size) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
 
        to_write = state->size - state->written;
 
@@ -2364,10 +3071,576 @@ 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;
+}
+
+struct cli_smb2_splice_state {
+       struct tevent_context *ev;
+       struct cli_state *cli;
+       struct smb2_hnd *src_ph;
+       struct smb2_hnd *dst_ph;
+       int (*splice_cb)(off_t n, void *priv);
+       void *priv;
+       off_t written;
+       off_t size;
+       off_t src_offset;
+       off_t dst_offset;
+       bool resized;
+       struct req_resume_key_rsp resume_rsp;
+       struct srv_copychunk_copy cc_copy;
+};
+
+static void cli_splice_copychunk_send(struct cli_smb2_splice_state *state,
+                                     struct tevent_req *req);
+
+static void cli_splice_copychunk_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb2_splice_state *state =
+               tevent_req_data(req,
+               struct cli_smb2_splice_state);
+       struct smbXcli_conn *conn = state->cli->conn;
+       DATA_BLOB out_input_buffer = data_blob_null;
+       DATA_BLOB out_output_buffer = data_blob_null;
+       struct srv_copychunk_rsp cc_copy_rsp;
+       enum ndr_err_code ndr_ret;
+       NTSTATUS status;
+
+       status = smb2cli_ioctl_recv(subreq, state,
+                                   &out_input_buffer,
+                                   &out_output_buffer);
+       TALLOC_FREE(subreq);
+       if ((!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER) ||
+            state->resized) && tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       ndr_ret = ndr_pull_struct_blob(&out_output_buffer, state, &cc_copy_rsp,
+                       (ndr_pull_flags_fn_t)ndr_pull_srv_copychunk_rsp);
+       if (ndr_ret != NDR_ERR_SUCCESS) {
+               DEBUG(0, ("failed to unmarshall copy chunk rsp\n"));
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
+               uint32_t max_chunks = MIN(cc_copy_rsp.chunks_written,
+                            cc_copy_rsp.total_bytes_written / cc_copy_rsp.chunk_bytes_written);
+               if ((cc_copy_rsp.chunk_bytes_written > smb2cli_conn_cc_chunk_len(conn) ||
+                    max_chunks > smb2cli_conn_cc_max_chunks(conn)) &&
+                    tevent_req_nterror(req, status)) {
+                       return;
+               }
+
+               state->resized = true;
+               smb2cli_conn_set_cc_chunk_len(conn, cc_copy_rsp.chunk_bytes_written);
+               smb2cli_conn_set_cc_max_chunks(conn, max_chunks);
+       } else {
+               if ((state->src_offset > INT64_MAX - cc_copy_rsp.total_bytes_written) ||
+                   (state->dst_offset > INT64_MAX - cc_copy_rsp.total_bytes_written) ||
+                   (state->written > INT64_MAX - cc_copy_rsp.total_bytes_written)) {
+                       tevent_req_nterror(req, NT_STATUS_FILE_TOO_LARGE);
+                       return;
+               }
+               state->src_offset += cc_copy_rsp.total_bytes_written;
+               state->dst_offset += cc_copy_rsp.total_bytes_written;
+               state->written += cc_copy_rsp.total_bytes_written;
+               if (!state->splice_cb(state->written, state->priv)) {
+                       tevent_req_nterror(req, NT_STATUS_CANCELLED);
+                       return;
+               }
+       }
+
+       cli_splice_copychunk_send(state, req);
+}
+
+static void cli_splice_copychunk_send(struct cli_smb2_splice_state *state,
+                                     struct tevent_req *req)
+{
+       struct tevent_req *subreq;
+       enum ndr_err_code ndr_ret;
+       struct smbXcli_conn *conn = state->cli->conn;
+       struct srv_copychunk_copy *cc_copy = &state->cc_copy;
+       off_t src_offset = state->src_offset;
+       off_t dst_offset = state->dst_offset;
+       uint32_t req_len = MIN(smb2cli_conn_cc_chunk_len(conn) * smb2cli_conn_cc_max_chunks(conn),
+                              state->size - state->written);
+       DATA_BLOB in_input_buffer = data_blob_null;
+       DATA_BLOB in_output_buffer = data_blob_null;
+
+       if (state->size - state->written == 0) {
+               tevent_req_done(req);
+               return;
+       }
+
+       cc_copy->chunk_count = 0;
+       while (req_len) {
+               cc_copy->chunks[cc_copy->chunk_count].source_off = src_offset;
+               cc_copy->chunks[cc_copy->chunk_count].target_off = dst_offset;
+               cc_copy->chunks[cc_copy->chunk_count].length = MIN(req_len,
+                                                                  smb2cli_conn_cc_chunk_len(conn));
+               if (req_len < cc_copy->chunks[cc_copy->chunk_count].length) {
+                       tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
+                       return;
+               }
+               req_len -= cc_copy->chunks[cc_copy->chunk_count].length;
+               if ((src_offset > INT64_MAX - cc_copy->chunks[cc_copy->chunk_count].length) ||
+                   (dst_offset > INT64_MAX - cc_copy->chunks[cc_copy->chunk_count].length)) {
+                       tevent_req_nterror(req, NT_STATUS_FILE_TOO_LARGE);
+                       return;
+               }
+               src_offset += cc_copy->chunks[cc_copy->chunk_count].length;
+               dst_offset += cc_copy->chunks[cc_copy->chunk_count].length;
+               cc_copy->chunk_count++;
+       }
+
+       ndr_ret = ndr_push_struct_blob(&in_input_buffer, state, cc_copy,
+                                      (ndr_push_flags_fn_t)ndr_push_srv_copychunk_copy);
+       if (ndr_ret != NDR_ERR_SUCCESS) {
+               DEBUG(0, ("failed to marshall copy chunk req\n"));
+               tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
+               return;
+       }
+
+       subreq = smb2cli_ioctl_send(state, state->ev, state->cli->conn,
+                              state->cli->timeout,
+                              state->cli->smb2.session,
+                              state->cli->smb2.tcon,
+                              state->dst_ph->fid_persistent, /* in_fid_persistent */
+                              state->dst_ph->fid_volatile, /* in_fid_volatile */
+                              FSCTL_SRV_COPYCHUNK_WRITE,
+                              0, /* in_max_input_length */
+                              &in_input_buffer,
+                              12, /* in_max_output_length */
+                              &in_output_buffer,
+                              SMB2_IOCTL_FLAG_IS_FSCTL);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq,
+                               cli_splice_copychunk_done,
+                               req);
+}
+
+static void cli_splice_key_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb2_splice_state *state =
+               tevent_req_data(req,
+               struct cli_smb2_splice_state);
+       enum ndr_err_code ndr_ret;
+       NTSTATUS status;
+
+       DATA_BLOB out_input_buffer = data_blob_null;
+       DATA_BLOB out_output_buffer = data_blob_null;
+
+       status = smb2cli_ioctl_recv(subreq, state,
+                                   &out_input_buffer,
+                                   &out_output_buffer);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+
+       ndr_ret = ndr_pull_struct_blob(&out_output_buffer,
+                       state, &state->resume_rsp,
+                       (ndr_pull_flags_fn_t)ndr_pull_req_resume_key_rsp);
+       if (ndr_ret != NDR_ERR_SUCCESS) {
+               DEBUG(0, ("failed to unmarshall resume key rsp\n"));
+               tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+               return;
+       }
+
+       memcpy(&state->cc_copy.source_key,
+              &state->resume_rsp.resume_key,
+              sizeof state->resume_rsp.resume_key);
+
+       cli_splice_copychunk_send(state, req);
+}
+
+struct tevent_req *cli_smb2_splice_send(TALLOC_CTX *mem_ctx,
+                               struct tevent_context *ev,
+                               struct cli_state *cli,
+                               uint16_t src_fnum, uint16_t dst_fnum,
+                               off_t size, off_t src_offset, off_t dst_offset,
+                               int (*splice_cb)(off_t n, void *priv),
+                               void *priv)
+{
+       struct tevent_req *req;
+       struct tevent_req *subreq;
+       struct cli_smb2_splice_state *state;
+       NTSTATUS status;
+       DATA_BLOB in_input_buffer = data_blob_null;
+       DATA_BLOB in_output_buffer = data_blob_null;
+
+       req = tevent_req_create(mem_ctx, &state, struct cli_smb2_splice_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->cli = cli;
+       state->ev = ev;
+       state->splice_cb = splice_cb;
+       state->priv = priv;
+       state->size = size;
+       state->written = 0;
+       state->src_offset = src_offset;
+       state->dst_offset = dst_offset;
+       state->cc_copy.chunks = talloc_array(state,
+                                            struct srv_copychunk,
+                                            smb2cli_conn_cc_max_chunks(cli->conn));
+       if (state->cc_copy.chunks == NULL) {
+               return NULL;
+       }
+
+       status = map_fnum_to_smb2_handle(cli, src_fnum, &state->src_ph);
+       if (tevent_req_nterror(req, status))
+               return tevent_req_post(req, ev);
+
+       status = map_fnum_to_smb2_handle(cli, dst_fnum, &state->dst_ph);
+       if (tevent_req_nterror(req, status))
+               return tevent_req_post(req, ev);
+
+       subreq = smb2cli_ioctl_send(state, ev, cli->conn,
+                              cli->timeout,
+                              cli->smb2.session,
+                              cli->smb2.tcon,
+                              state->src_ph->fid_persistent, /* in_fid_persistent */
+                              state->src_ph->fid_volatile, /* in_fid_volatile */
+                              FSCTL_SRV_REQUEST_RESUME_KEY,
+                              0, /* in_max_input_length */
+                              &in_input_buffer,
+                              32, /* in_max_output_length */
+                              &in_output_buffer,
+                              SMB2_IOCTL_FLAG_IS_FSCTL);
+       if (tevent_req_nomem(subreq, req)) {
+               return NULL;
+       }
+       tevent_req_set_callback(subreq,
+                               cli_splice_key_done,
+                               req);
+
+       return req;
+}
+
+NTSTATUS cli_smb2_splice_recv(struct tevent_req *req, off_t *written)
+{
+       struct cli_smb2_splice_state *state = tevent_req_data(
+               req, struct cli_smb2_splice_state);
+       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;
 }
+
+/***************************************************************
+ SMB2 enum shadow copy data.
+***************************************************************/
+
+struct cli_smb2_shadow_copy_data_fnum_state {
+       struct cli_state *cli;
+       uint16_t fnum;
+       struct smb2_hnd *ph;
+       DATA_BLOB out_input_buffer;
+       DATA_BLOB out_output_buffer;
+};
+
+static void cli_smb2_shadow_copy_data_fnum_done(struct tevent_req *subreq);
+
+static struct tevent_req *cli_smb2_shadow_copy_data_fnum_send(
+                                       TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       struct cli_state *cli,
+                                       uint16_t fnum,
+                                       bool get_names)
+{
+       struct tevent_req *req, *subreq;
+       struct cli_smb2_shadow_copy_data_fnum_state *state;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_smb2_shadow_copy_data_fnum_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
+
+       state->cli = cli;
+       state->fnum = fnum;
+
+       status = map_fnum_to_smb2_handle(cli, fnum, &state->ph);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
+       }
+
+       /*
+        * TODO. Under SMB2 we should send a zero max_output_length
+        * ioctl to get the required size, then send another ioctl
+        * to get the data, but the current SMB1 implementation just
+        * does one roundtrip with a 64K buffer size. Do the same
+        * for now. JRA.
+        */
+
+       subreq = smb2cli_ioctl_send(state, ev, state->cli->conn,
+                       state->cli->timeout,
+                       state->cli->smb2.session,
+                       state->cli->smb2.tcon,
+                       state->ph->fid_persistent, /* in_fid_persistent */
+                       state->ph->fid_volatile, /* in_fid_volatile */
+                       FSCTL_GET_SHADOW_COPY_DATA,
+                       0, /* in_max_input_length */
+                       NULL, /* in_input_buffer */
+                       get_names ?
+                               CLI_BUFFER_SIZE : 16, /* in_max_output_length */
+                       NULL, /* in_output_buffer */
+                       SMB2_IOCTL_FLAG_IS_FSCTL);
+
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq,
+                               cli_smb2_shadow_copy_data_fnum_done,
+                               req);
+
+       return req;
+}
+
+static void cli_smb2_shadow_copy_data_fnum_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb2_shadow_copy_data_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_shadow_copy_data_fnum_state);
+       NTSTATUS status;
+
+       status = smb2cli_ioctl_recv(subreq, state,
+                               &state->out_input_buffer,
+                               &state->out_output_buffer);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+       tevent_req_done(req);
+}
+
+static NTSTATUS cli_smb2_shadow_copy_data_fnum_recv(struct tevent_req *req,
+                               TALLOC_CTX *mem_ctx,
+                               bool get_names,
+                               char ***pnames,
+                               int *pnum_names)
+{
+       struct cli_smb2_shadow_copy_data_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_shadow_copy_data_fnum_state);
+       char **names = NULL;
+       uint32_t num_names = 0;
+       uint32_t num_names_returned = 0;
+       uint32_t dlength = 0;
+       uint32_t i;
+       uint8_t *endp = NULL;
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+
+       if (state->out_output_buffer.length < 16) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+
+       num_names = IVAL(state->out_output_buffer.data, 0);
+       num_names_returned = IVAL(state->out_output_buffer.data, 4);
+       dlength = IVAL(state->out_output_buffer.data, 8);
+
+       if (num_names > 0x7FFFFFFF) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+
+       if (get_names == false) {
+               *pnum_names = (int)num_names;
+               return NT_STATUS_OK;
+       }
+       if (num_names != num_names_returned) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+       if (dlength + 12 < 12) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+       /*
+        * NB. The below is an allowable return if there are
+        * more snapshots than the buffer size we told the
+        * server we can receive. We currently don't support
+        * this.
+        */
+       if (dlength + 12 > state->out_output_buffer.length) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+       if (state->out_output_buffer.length +
+                       (2 * sizeof(SHADOW_COPY_LABEL)) <
+                               state->out_output_buffer.length) {
+               return NT_STATUS_INVALID_NETWORK_RESPONSE;
+       }
+
+       names = talloc_array(mem_ctx, char *, num_names_returned);
+       if (names == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       endp = state->out_output_buffer.data +
+                       state->out_output_buffer.length;
+
+       for (i=0; i<num_names_returned; i++) {
+               bool ret;
+               uint8_t *src;
+               size_t converted_size;
+
+               src = state->out_output_buffer.data + 12 +
+                       (i * 2 * sizeof(SHADOW_COPY_LABEL));
+
+               if (src + (2 * sizeof(SHADOW_COPY_LABEL)) > endp) {
+                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
+               }
+               ret = convert_string_talloc(
+                       names, CH_UTF16LE, CH_UNIX,
+                       src, 2 * sizeof(SHADOW_COPY_LABEL),
+                       &names[i], &converted_size);
+               if (!ret) {
+                       TALLOC_FREE(names);
+                       return NT_STATUS_INVALID_NETWORK_RESPONSE;
+               }
+       }
+       *pnum_names = num_names;
+       *pnames = names;
+       return NT_STATUS_OK;
+}
+
+NTSTATUS cli_smb2_shadow_copy_data(TALLOC_CTX *mem_ctx,
+                               struct cli_state *cli,
+                               uint16_t fnum,
+                               bool get_names,
+                               char ***pnames,
+                               int *pnum_names)
+{
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+       ev = samba_tevent_context_init(frame);
+       if (ev == NULL) {
+               goto fail;
+       }
+       req = cli_smb2_shadow_copy_data_fnum_send(frame,
+                                       ev,
+                                       cli,
+                                       fnum,
+                                       get_names);
+       if (req == NULL) {
+               goto fail;
+       }
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+               goto fail;
+       }
+       status = cli_smb2_shadow_copy_data_fnum_recv(req,
+                                               mem_ctx,
+                                               get_names,
+                                               pnames,
+                                               pnum_names);
+ fail:
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+       return status;
+}
+
+/***************************************************************
+ Wrapper that allows SMB2 to truncate a file.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_ftruncate(struct cli_state *cli,
+                       uint16_t fnum,
+                       uint64_t newsize)
+{
+       NTSTATUS status;
+       DATA_BLOB inbuf = data_blob_null;
+       struct smb2_hnd *ph = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+
+       if (smbXcli_conn_has_async_calls(cli->conn)) {
+               /*
+                * Can't use sync call while an async call is in flight
+                */
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+
+       status = map_fnum_to_smb2_handle(cli,
+                                       fnum,
+                                       &ph);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       inbuf = data_blob_talloc_zero(frame, 8);
+       if (inbuf.data == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto fail;
+       }
+
+       SBVAL(inbuf.data, 0, newsize);
+
+       /* setinfo on the handle with info_type SMB2_SETINFO_FILE (1),
+          level 20 (SMB_FILE_END_OF_FILE_INFORMATION - 1000). */
+
+       status = smb2cli_set_info(cli->conn,
+                               cli->timeout,
+                               cli->smb2.session,
+                               cli->smb2.tcon,
+                               1, /* in_info_type */
+                                       /* in_file_info_class */
+                               SMB_FILE_END_OF_FILE_INFORMATION - 1000,
+                               &inbuf, /* in_input_buffer */
+                               0, /* in_additional_info */
+                               ph->fid_persistent,
+                               ph->fid_volatile);
+
+  fail:
+
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+       return status;
+}