s3/libsmb: adjust smb2 code for new idl structs & generated ndr push/pull funcs.
[samba.git] / source3 / libsmb / cli_smb2_fnum.c
index 848e077162ca1ad5843e5796a4590d739d588372..3537932c0d08481ae89ae65223ac240ea5f33eef 100644 (file)
@@ -41,6 +41,7 @@
 #include "lib/util_ea.h"
 #include "librpc/gen_ndr/ndr_ioctl.h"
 #include "ntioctl.h"
+#include "librpc/gen_ndr/ndr_quota.h"
 
 struct smb2_hnd {
        uint64_t fid_persistent;
@@ -449,8 +450,12 @@ 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;
+       NTSTATUS status = NT_STATUS_OK;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
+       }
+       tevent_req_received(req);
        return status;
 }
 
@@ -485,6 +490,133 @@ NTSTATUS cli_smb2_close_fnum(struct cli_state *cli, uint16_t fnum)
        return status;
 }
 
+struct cli_smb2_delete_on_close_state {
+       struct cli_state *cli;
+       uint16_t fnum;
+       struct smb2_hnd *ph;
+       uint8_t data[1];
+       DATA_BLOB inbuf;
+};
+
+static void cli_smb2_delete_on_close_done(struct tevent_req *subreq);
+
+struct tevent_req *cli_smb2_delete_on_close_send(TALLOC_CTX *mem_ctx,
+                                       struct tevent_context *ev,
+                                       struct cli_state *cli,
+                                       uint16_t fnum,
+                                       bool flag)
+{
+       struct tevent_req *req = NULL;
+       struct cli_smb2_delete_on_close_state *state = NULL;
+       struct tevent_req *subreq = NULL;
+       uint8_t in_info_type;
+       uint8_t in_file_info_class;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_smb2_delete_on_close_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       state->cli = cli;
+       state->fnum = fnum;
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
+
+       status = map_fnum_to_smb2_handle(cli, fnum, &state->ph);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, ev);
+       }
+
+       /*
+        * setinfo on the handle with info_type SMB2_SETINFO_FILE (1),
+        * level 13 (SMB_FILE_DISPOSITION_INFORMATION - 1000).
+        */
+       in_info_type = 1;
+       in_file_info_class = SMB_FILE_DISPOSITION_INFORMATION - 1000;
+       /* Setup data array. */
+       SCVAL(&state->data[0], 0, flag ? 1 : 0);
+       state->inbuf.data = &state->data[0];
+       state->inbuf.length = 1;
+
+       subreq = smb2cli_set_info_send(state, ev,
+                                      cli->conn,
+                                      cli->timeout,
+                                      cli->smb2.session,
+                                      cli->smb2.tcon,
+                                      in_info_type,
+                                      in_file_info_class,
+                                      &state->inbuf, /* in_input_buffer */
+                                      0, /* in_additional_info */
+                                      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_delete_on_close_done,
+                               req);
+       return req;
+}
+
+static void cli_smb2_delete_on_close_done(struct tevent_req *subreq)
+{
+       NTSTATUS status = smb2cli_set_info_recv(subreq);
+       tevent_req_simple_finish_ntstatus(subreq, status);
+}
+
+NTSTATUS cli_smb2_delete_on_close_recv(struct tevent_req *req)
+{
+       struct cli_smb2_delete_on_close_state *state =
+               tevent_req_data(req,
+               struct cli_smb2_delete_on_close_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               state->cli->raw_status = status;
+               tevent_req_received(req);
+               return status;
+       }
+
+       state->cli->raw_status = NT_STATUS_OK;
+       tevent_req_received(req);
+       return NT_STATUS_OK;
+}
+
+NTSTATUS cli_smb2_delete_on_close(struct cli_state *cli, uint16_t fnum, bool flag)
+{
+       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_delete_on_close_send(frame, ev, cli, fnum, flag);
+       if (req == NULL) {
+               goto fail;
+       }
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+               goto fail;
+       }
+       status = cli_smb2_delete_on_close_recv(req);
+ fail:
+       TALLOC_FREE(frame);
+       return status;
+}
+
 /***************************************************************
  Small wrapper that allows SMB2 to create a directory
  Synchronous only.
@@ -555,6 +687,27 @@ NTSTATUS cli_smb2_rmdir(struct cli_state *cli, const char *dname)
                        &fnum,
                        NULL);
 
+       if (NT_STATUS_EQUAL(status, NT_STATUS_STOPPED_ON_SYMLINK)) {
+               /*
+                * Naive option to match our SMB1 code. Assume the
+                * symlink path that tripped us up was the last
+                * component and try again. Eventually we will have to
+                * deal with the returned path unprocessed component. JRA.
+                */
+               status = cli_smb2_create_fnum(cli,
+                       dname,
+                       0,                      /* create_flags */
+                       DELETE_ACCESS,          /* 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|
+                               FILE_DELETE_ON_CLOSE|
+                               FILE_OPEN_REPARSE_POINT, /* create_options */
+                       &fnum,
+                       NULL);
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -593,6 +746,26 @@ NTSTATUS cli_smb2_unlink(struct cli_state *cli, const char *fname)
                        &fnum,
                        NULL);
 
+       if (NT_STATUS_EQUAL(status, NT_STATUS_STOPPED_ON_SYMLINK)) {
+               /*
+                * Naive option to match our SMB1 code. Assume the
+                * symlink path that tripped us up was the last
+                * component and try again. Eventually we will have to
+                * deal with the returned path unprocessed component. JRA.
+                */
+               status = cli_smb2_create_fnum(cli,
+                       fname,
+                       0,                      /* create_flags */
+                       DELETE_ACCESS,          /* desired_access */
+                       FILE_ATTRIBUTE_NORMAL, /* file attributes */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access */
+                       FILE_OPEN,              /* create_disposition */
+                       FILE_DELETE_ON_CLOSE|
+                               FILE_OPEN_REPARSE_POINT, /* create_options */
+                       &fnum,
+                       NULL);
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
@@ -631,6 +804,7 @@ static NTSTATUS parse_finfo_id_both_directory_info(uint8_t *dir_data,
                return NT_STATUS_INFO_LENGTH_MISMATCH;
        }
 
+       finfo->btime_ts = interpret_long_date((const char *)dir_data + 8);
        finfo->atime_ts = interpret_long_date((const char *)dir_data + 16);
        finfo->mtime_ts = interpret_long_date((const char *)dir_data + 24);
        finfo->ctime_ts = interpret_long_date((const char *)dir_data + 32);
@@ -730,6 +904,7 @@ NTSTATUS cli_smb2_list(struct cli_state *cli,
        TALLOC_CTX *frame = talloc_stackframe();
        TALLOC_CTX *subframe = NULL;
        bool mask_has_wild;
+       uint32_t max_trans = smb2cli_conn_max_trans_size(cli->conn);
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
                /*
@@ -793,7 +968,7 @@ NTSTATUS cli_smb2_list(struct cli_state *cli,
                                        ph->fid_persistent,
                                        ph->fid_volatile,
                                        mask,
-                                       0xffff,
+                                       max_trans,
                                        subframe,
                                        &dir_data,
                                        &dir_data_length);
@@ -973,6 +1148,47 @@ NTSTATUS cli_smb2_qpathinfo_basic(struct cli_state *cli,
        return status;
 }
 
+/***************************************************************
+ Wrapper that allows SMB2 to check if a path is a directory.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_chkpath(struct cli_state *cli,
+                               const char *name)
+{
+       NTSTATUS status;
+       uint16_t fnum = 0xffff;
+
+       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;
+       }
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* Ensure this is a directory. */
+       status = cli_smb2_create_fnum(cli,
+                       name,
+                       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)) {
+               return status;
+       }
+
+       return cli_smb2_close_fnum(cli, fnum);
+}
+
 /***************************************************************
  Helper function for pathname operations.
 ***************************************************************/
@@ -985,6 +1201,7 @@ static NTSTATUS get_fnum_from_path(struct cli_state *cli,
        NTSTATUS status;
        size_t namelen = strlen(name);
        TALLOC_CTX *frame = talloc_stackframe();
+       uint32_t create_options = 0;
 
        /* SMB2 is pickier about pathnames. Ensure it doesn't
           end in a '\' */
@@ -1006,11 +1223,32 @@ static NTSTATUS get_fnum_from_path(struct cli_state *cli,
                        0, /* file attributes */
                        FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access */
                        FILE_OPEN,              /* create_disposition */
-                       0,      /* create_options */
+                       create_options,
+                       pfnum,
+                       NULL);
+
+       if (NT_STATUS_EQUAL(status, NT_STATUS_STOPPED_ON_SYMLINK)) {
+               /*
+                * Naive option to match our SMB1 code. Assume the
+                * symlink path that tripped us up was the last
+                * component and try again. Eventually we will have to
+                * deal with the returned path unprocessed component. JRA.
+                */
+               create_options |= FILE_OPEN_REPARSE_POINT;
+               status = cli_smb2_create_fnum(cli,
+                       name,
+                       0,                      /* create_flags */
+                       desired_access,
+                       0, /* file attributes */
+                       FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, /* share_access */
+                       FILE_OPEN,              /* create_disposition */
+                       create_options,
                        pfnum,
                        NULL);
+       }
 
        if (NT_STATUS_EQUAL(status, NT_STATUS_FILE_IS_A_DIRECTORY)) {
+               create_options |= FILE_DIRECTORY_FILE;
                status = cli_smb2_create_fnum(cli,
                        name,
                        0,                      /* create_flags */
@@ -1519,20 +1757,20 @@ NTSTATUS cli_smb2_qpathinfo_streams(struct cli_state *cli,
 }
 
 /***************************************************************
- Wrapper that allows SMB2 to set pathname attributes.
+ Wrapper that allows SMB2 to set SMB_FILE_BASIC_INFORMATION on
+ a pathname.
  Synchronous only.
 ***************************************************************/
 
-NTSTATUS cli_smb2_setatr(struct cli_state *cli,
+NTSTATUS cli_smb2_setpathinfo(struct cli_state *cli,
                        const char *name,
-                       uint16_t attr,
-                       time_t mtime)
+                       uint8_t in_info_type,
+                       uint8_t in_file_info_class,
+                       const DATA_BLOB *p_in_data)
 {
        NTSTATUS status;
        uint16_t fnum = 0xffff;
        struct smb2_hnd *ph = NULL;
-       uint8_t inbuf_store[40];
-       DATA_BLOB inbuf = data_blob_null;
        TALLOC_CTX *frame = talloc_stackframe();
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
@@ -1564,29 +1802,13 @@ NTSTATUS cli_smb2_setatr(struct cli_state *cli,
                goto fail;
        }
 
-       /* setinfo on the handle with info_type SMB2_SETINFO_FILE (1),
-          level 4 (SMB_FILE_BASIC_INFORMATION - 1000). */
-
-       inbuf.data = inbuf_store;
-       inbuf.length = sizeof(inbuf_store);
-       data_blob_clear(&inbuf);
-
-       SSVAL(inbuf.data, 32, attr);
-       if (mtime != 0) {
-               put_long_date((char *)inbuf.data + 16,mtime);
-       }
-       /* Set all the other times to -1. */
-       SBVAL(inbuf.data, 0, 0xFFFFFFFFFFFFFFFFLL);
-       SBVAL(inbuf.data, 8, 0xFFFFFFFFFFFFFFFFLL);
-       SBVAL(inbuf.data, 24, 0xFFFFFFFFFFFFFFFFLL);
-
        status = smb2cli_set_info(cli->conn,
                                cli->timeout,
                                cli->smb2.session,
                                cli->smb2.tcon,
-                               1, /* in_info_type */
-                               SMB_FILE_BASIC_INFORMATION - 1000, /* in_file_info_class */
-                               &inbuf, /* in_input_buffer */
+                               in_info_type,
+                               in_file_info_class,
+                               p_in_data, /* in_input_buffer */
                                0, /* in_additional_info */
                                ph->fid_persistent,
                                ph->fid_volatile);
@@ -1602,6 +1824,68 @@ NTSTATUS cli_smb2_setatr(struct cli_state *cli,
        return status;
 }
 
+
+/***************************************************************
+ Wrapper that allows SMB2 to set pathname attributes.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_setatr(struct cli_state *cli,
+                       const char *name,
+                       uint16_t attr,
+                       time_t mtime)
+{
+       uint8_t inbuf_store[40];
+       DATA_BLOB inbuf = data_blob_null;
+
+       /* setinfo on the handle with info_type SMB2_SETINFO_FILE (1),
+          level 4 (SMB_FILE_BASIC_INFORMATION - 1000). */
+
+       inbuf.data = inbuf_store;
+       inbuf.length = sizeof(inbuf_store);
+       data_blob_clear(&inbuf);
+
+       /*
+        * SMB1 uses attr == 0 to clear all attributes
+        * on a file (end up with FILE_ATTRIBUTE_NORMAL),
+        * and attr == FILE_ATTRIBUTE_NORMAL to mean ignore
+        * request attribute change.
+        *
+        * SMB2 uses exactly the reverse. Unfortunately as the
+        * cli_setatr() ABI is exposed inside libsmbclient,
+        * we must make the SMB2 cli_smb2_setatr() call
+        * export the same ABI as the SMB1 cli_setatr()
+        * which calls it. This means reversing the sense
+        * of the requested attr argument if it's zero
+        * or FILE_ATTRIBUTE_NORMAL.
+        *
+        * See BUG: https://bugzilla.samba.org/show_bug.cgi?id=12899
+        */
+
+       if (attr == 0) {
+               attr = FILE_ATTRIBUTE_NORMAL;
+       } else if (attr == FILE_ATTRIBUTE_NORMAL) {
+               attr = 0;
+       }
+
+       SSVAL(inbuf.data, 32, attr);
+       if (mtime != 0) {
+               put_long_date((char *)inbuf.data + 16,mtime);
+       }
+       /* Set all the other times to -1. */
+       SBVAL(inbuf.data, 0, 0xFFFFFFFFFFFFFFFFLL);
+       SBVAL(inbuf.data, 8, 0xFFFFFFFFFFFFFFFFLL);
+       SBVAL(inbuf.data, 24, 0xFFFFFFFFFFFFFFFFLL);
+
+       return cli_smb2_setpathinfo(cli,
+                               name,
+                               1, /* in_info_type */
+                               /* in_file_info_class */
+                               SMB_FILE_BASIC_INFORMATION - 1000,
+                               &inbuf);
+}
+
+
 /***************************************************************
  Wrapper that allows SMB2 to set file handle times.
  Synchronous only.
@@ -1778,6 +2062,103 @@ NTSTATUS cli_smb2_dskattr(struct cli_state *cli, const char *path,
        return status;
 }
 
+/***************************************************************
+ Wrapper that allows SMB2 to query file system sizes.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_get_fs_full_size_info(struct cli_state *cli,
+                               uint64_t *total_allocation_units,
+                               uint64_t *caller_allocation_units,
+                               uint64_t *actual_allocation_units,
+                               uint64_t *sectors_per_allocation_unit,
+                               uint64_t *bytes_per_sector)
+{
+       NTSTATUS status;
+       uint16_t fnum = 0xffff;
+       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 fail;
+       }
+
+       if (smbXcli_conn_protocol(cli->conn) < PROTOCOL_SMB2_02) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+
+       /* 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;
+       }
+
+       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_FS (2),
+          level 7 (SMB_FS_FULL_SIZE_INFORMATION). */
+
+       status = smb2cli_query_info(cli->conn,
+                               cli->timeout,
+                               cli->smb2.session,
+                               cli->smb2.tcon,
+                               SMB2_GETINFO_FS, /* in_info_type */
+                               /* in_file_info_class */
+                               SMB_FS_FULL_SIZE_INFORMATION - 1000,
+                               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 (outbuf.length < 32) {
+               status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+               goto fail;
+       }
+
+       *total_allocation_units = BIG_UINT(outbuf.data, 0);
+       *caller_allocation_units = BIG_UINT(outbuf.data, 8);
+       *actual_allocation_units = BIG_UINT(outbuf.data, 16);
+       *sectors_per_allocation_unit = (uint64_t)IVAL(outbuf.data, 24);
+       *bytes_per_sector = (uint64_t)IVAL(outbuf.data, 28);
+
+fail:
+
+       if (fnum != 0xffff) {
+               cli_smb2_close_fnum(cli, fnum);
+       }
+
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+       return status;
+}
+
 /***************************************************************
  Wrapper that allows SMB2 to query file system attributes.
  Synchronous only.
@@ -1838,12 +2219,141 @@ NTSTATUS cli_smb2_get_fs_attr_info(struct cli_state *cli, uint32_t *fs_attr)
                goto fail;
        }
 
-       if (outbuf.length < 12) {
+       if (outbuf.length < 12) {
+               status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+               goto 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 query file system volume info.
+ Synchronous only.
+***************************************************************/
+
+NTSTATUS cli_smb2_get_fs_volume_info(struct cli_state *cli,
+                                TALLOC_CTX *mem_ctx,
+                                char **_volume_name,
+                                uint32_t *pserial_number,
+                                time_t *pdate)
+{
+       NTSTATUS status;
+       uint16_t fnum = 0xffff;
+       DATA_BLOB outbuf = data_blob_null;
+       struct smb2_hnd *ph = NULL;
+       uint32_t nlen;
+       char *volume_name = 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;
+       }
+
+       /* 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;
+       }
+
+       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_FS (2),
+          level 1 (SMB_FS_VOLUME_INFORMATION). */
+
+       status = smb2cli_query_info(cli->conn,
+                               cli->timeout,
+                               cli->smb2.session,
+                               cli->smb2.tcon,
+                               SMB2_GETINFO_FS, /* in_info_type */
+                               /* in_file_info_class */
+                               SMB_FS_VOLUME_INFORMATION - 1000,
+                               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 (outbuf.length < 24) {
                status = NT_STATUS_INVALID_NETWORK_RESPONSE;
                goto fail;
        }
 
-       *fs_attr = IVAL(outbuf.data, 0);
+       if (pdate) {
+               struct timespec ts;
+               ts = interpret_long_date((char *)outbuf.data);
+               *pdate = ts.tv_sec;
+       }
+       if (pserial_number) {
+               *pserial_number = IVAL(outbuf.data,8);
+       }
+       nlen = IVAL(outbuf.data,12);
+       if (nlen + 18 < 18) {
+               /* Integer wrap. */
+               status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+               goto fail;
+       }
+       /*
+        * The next check is safe as we know outbuf.length >= 24
+        * from above.
+        */
+       if (nlen > (outbuf.length - 18)) {
+               status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+               goto fail;
+       }
+
+       clistr_pull_talloc(mem_ctx,
+                       (const char *)outbuf.data,
+                       0,
+                       &volume_name,
+                       outbuf.data + 18,
+                       nlen,
+                       STR_UNICODE);
+       if (volume_name == NULL) {
+               status = map_nt_error_from_unix(errno);
+               goto fail;
+       }
+
+       *_volume_name = volume_name;
 
 fail:
 
@@ -1857,6 +2367,7 @@ fail:
        return status;
 }
 
+
 /***************************************************************
  Wrapper that allows SMB2 to query a security descriptor.
  Synchronous only.
@@ -2010,8 +2521,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;
@@ -2091,6 +2603,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);
 
@@ -2395,12 +2911,16 @@ NTSTATUS cli_smb2_get_user_quota(struct cli_state *cli,
 {
        NTSTATUS status;
        DATA_BLOB inbuf = data_blob_null;
+       DATA_BLOB info_blob = 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;
+       struct smb2_query_quota_info query = {0};
+       struct file_get_quota_info info = {0};
+       enum ndr_err_code err;
+       struct ndr_push *ndr_push = NULL;
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
                /*
@@ -2422,27 +2942,52 @@ NTSTATUS cli_smb2_get_user_quota(struct cli_state *cli,
 
        sid_len = ndr_size_dom_sid(&pqt->sid, 0);
 
-       inbuf = data_blob_talloc_zero(frame, 24 + sid_len);
-       if (inbuf.data == NULL) {
+       query.return_single = 1;
+       if (sid_len < 0) {
+               status = NT_STATUS_INVALID_PARAMETER;
+               goto fail;
+       }
+
+       info.next_entry_offset = 0;
+       info.sid_length = sid_len;
+       info.sid = pqt->sid;
+
+       err = ndr_push_struct_blob(
+                       &info_blob,
+                       frame,
+                       &info,
+                       (ndr_push_flags_fn_t)ndr_push_file_get_quota_info);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
+               status = NT_STATUS_INTERNAL_ERROR;
+               goto fail;
+       }
+
+       query.sid_list_length = info_blob.length;
+       ndr_push = ndr_push_init_ctx(frame);
+       if (!ndr_push) {
                status = NT_STATUS_NO_MEMORY;
                goto fail;
        }
 
-       buf = inbuf.data;
+       err = ndr_push_smb2_query_quota_info(ndr_push,
+                                            NDR_SCALARS | NDR_BUFFERS,
+                                            &query);
 
-       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;
+       if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
+               status = NT_STATUS_INTERNAL_ERROR;
+               goto fail;
+       }
+
+       err = ndr_push_array_uint8(ndr_push, NDR_SCALARS, info_blob.data,
+                                  info_blob.length);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
+               status = NT_STATUS_INTERNAL_ERROR;
                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);
+       inbuf.data = ndr_push->data;
+       inbuf.length = ndr_push->offset;
 
        status = smb2cli_query_info(cli->conn, cli->timeout, cli->smb2.session,
                                    cli->smb2.tcon, 4, /* in_info_type */
@@ -2487,7 +3032,8 @@ NTSTATUS cli_smb2_list_user_quota_step(struct cli_state *cli,
        DATA_BLOB outbuf = data_blob_null;
        struct smb2_hnd *ph = NULL;
        TALLOC_CTX *frame = talloc_stackframe();
-       uint8_t *buf;
+       struct smb2_query_quota_info info = {0};
+       enum ndr_err_code err;
 
        if (smbXcli_conn_has_async_calls(cli->conn)) {
                /*
@@ -2507,20 +3053,19 @@ NTSTATUS cli_smb2_list_user_quota_step(struct cli_state *cli,
                goto cleanup;
        }
 
-       inbuf = data_blob_talloc_zero(frame, 16);
-       if (inbuf.data == NULL) {
-               status = NT_STATUS_NO_MEMORY;
-               goto cleanup;
-       }
 
-       buf = inbuf.data;
+       info.restart_scan = first ? 1 : 0;
 
-       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 */
+       err = ndr_push_struct_blob(
+                       &inbuf,
+                       frame,
+                       &info,
+                       (ndr_push_flags_fn_t)ndr_push_smb2_query_quota_info);
+
+       if (!NDR_ERR_CODE_IS_SUCCESS(err)) {
+               status = NT_STATUS_INTERNAL_ERROR;
+               goto cleanup;
+       }
 
        status = smb2cli_query_info(cli->conn, cli->timeout, cli->smb2.session,
                                    cli->smb2.tcon, 4, /* in_info_type */
@@ -2532,6 +3077,14 @@ NTSTATUS cli_smb2_list_user_quota_step(struct cli_state *cli,
                                    ph->fid_persistent, ph->fid_volatile, frame,
                                    &outbuf);
 
+       /*
+        * safeguard against panic from calling parse_user_quota_list with
+        * NULL buffer
+        */
+       if (NT_STATUS_IS_OK(status) && outbuf.length == 0) {
+               status = NT_STATUS_NO_MORE_ENTRIES;
+       }
+
        if (!NT_STATUS_IS_OK(status)) {
                goto cleanup;
        }
@@ -3639,3 +4192,297 @@ NTSTATUS cli_smb2_ftruncate(struct cli_state *cli,
        TALLOC_FREE(frame);
        return status;
 }
+
+NTSTATUS cli_smb2_notify(struct cli_state *cli, uint16_t fnum,
+                        uint32_t buffer_size, uint32_t completion_filter,
+                        bool recursive, TALLOC_CTX *mem_ctx,
+                        struct notify_change **pchanges,
+                        uint32_t *pnum_changes)
+{
+       NTSTATUS status;
+       struct smb2_hnd *ph = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+       uint8_t *base;
+       uint32_t len, ofs;
+       struct notify_change *changes = NULL;
+       size_t num_changes = 0;
+
+       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;
+       }
+
+       status = smb2cli_notify(cli->conn, cli->timeout,
+                               cli->smb2.session, cli->smb2.tcon,
+                               buffer_size,
+                               ph->fid_persistent, ph->fid_volatile,
+                               completion_filter, recursive,
+                               frame, &base, &len);
+
+       if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
+               len = 0;
+               status = NT_STATUS_OK;
+       }
+
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       ofs = 0;
+
+       while (len - ofs >= 12) {
+               struct notify_change *tmp;
+               struct notify_change *c;
+               uint32_t next_ofs = IVAL(base, ofs);
+               uint32_t file_name_length = IVAL(base, ofs+8);
+               size_t namelen;
+               bool ok;
+
+               tmp = talloc_realloc(frame, changes, struct notify_change,
+                                    num_changes + 1);
+               if (tmp == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto fail;
+               }
+               changes = tmp;
+               c = &changes[num_changes];
+               num_changes += 1;
+
+               if (smb_buffer_oob(len, ofs, next_ofs) ||
+                   smb_buffer_oob(len, ofs+12, file_name_length)) {
+                       status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                       goto fail;
+               }
+
+               c->action = IVAL(base, ofs+4);
+
+               ok = convert_string_talloc(changes, CH_UTF16LE, CH_UNIX,
+                                          base + ofs + 12, file_name_length,
+                                          &c->name, &namelen);
+               if (!ok) {
+                       status = NT_STATUS_INVALID_NETWORK_RESPONSE;
+                       goto fail;
+               }
+
+               if (next_ofs == 0) {
+                       break;
+               }
+               ofs += next_ofs;
+       }
+
+       *pchanges = talloc_move(mem_ctx, &changes);
+       *pnum_changes = num_changes;
+       status = NT_STATUS_OK;
+
+fail:
+       cli->raw_status = status;
+
+       TALLOC_FREE(frame);
+       return status;
+}
+
+struct cli_smb2_set_reparse_point_fnum_state {
+       struct cli_state *cli;
+       uint16_t fnum;
+       struct smb2_hnd *ph;
+       DATA_BLOB input_buffer;
+};
+
+static void cli_smb2_set_reparse_point_fnum_done(struct tevent_req *subreq);
+
+struct tevent_req *cli_smb2_set_reparse_point_fnum_send(
+                               TALLOC_CTX *mem_ctx,
+                               struct tevent_context *ev,
+                               struct cli_state *cli,
+                               uint16_t fnum,
+                               DATA_BLOB in_buf)
+{
+       struct tevent_req *req, *subreq;
+       struct cli_smb2_set_reparse_point_fnum_state *state = NULL;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_smb2_set_reparse_point_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);
+       }
+
+       state->input_buffer = data_blob_talloc(state,
+                                               in_buf.data,
+                                               in_buf.length);
+       if (state->input_buffer.data == NULL) {
+               tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+               return tevent_req_post(req, ev);
+       }
+
+       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_SET_REPARSE_POINT,
+                       0, /* in_max_input_length */
+                       &state->input_buffer ,
+                       0,
+                       NULL,
+                       SMB2_IOCTL_FLAG_IS_FSCTL);
+
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq,
+                               cli_smb2_set_reparse_point_fnum_done,
+                               req);
+
+       return req;
+}
+
+static void cli_smb2_set_reparse_point_fnum_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb2_set_reparse_point_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_set_reparse_point_fnum_state);
+       NTSTATUS status;
+
+       status = smb2cli_ioctl_recv(subreq, state,
+                               NULL,
+                               NULL);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+       tevent_req_done(req);
+}
+
+NTSTATUS cli_smb2_set_reparse_point_fnum_recv(struct tevent_req *req)
+{
+        return tevent_req_simple_recv_ntstatus(req);
+}
+
+struct cli_smb2_get_reparse_point_fnum_state {
+       struct cli_state *cli;
+       uint16_t fnum;
+       struct smb2_hnd *ph;
+       DATA_BLOB output_buffer;
+};
+
+static void cli_smb2_get_reparse_point_fnum_done(struct tevent_req *subreq);
+
+struct tevent_req *cli_smb2_get_reparse_point_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_set_reparse_point_fnum_state *state = NULL;
+       NTSTATUS status;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct cli_smb2_get_reparse_point_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);
+       }
+
+       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_REPARSE_POINT,
+                       0, /* in_max_input_length */
+                       NULL,
+                       64*1024,
+                       NULL,
+                       SMB2_IOCTL_FLAG_IS_FSCTL);
+
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq,
+                               cli_smb2_get_reparse_point_fnum_done,
+                               req);
+
+       return req;
+}
+
+static void cli_smb2_get_reparse_point_fnum_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct cli_smb2_get_reparse_point_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_get_reparse_point_fnum_state);
+       NTSTATUS status;
+
+       status = smb2cli_ioctl_recv(subreq, state,
+                               NULL,
+                               &state->output_buffer);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               state->cli->raw_status = status;
+               return;
+       }
+       tevent_req_done(req);
+}
+
+NTSTATUS cli_smb2_get_reparse_point_fnum_recv(struct tevent_req *req,
+                               TALLOC_CTX *mem_ctx,
+                               DATA_BLOB *output)
+{
+       struct cli_smb2_get_reparse_point_fnum_state *state = tevent_req_data(
+               req, struct cli_smb2_get_reparse_point_fnum_state);
+
+       if (tevent_req_is_nterror(req, &state->cli->raw_status)) {
+               tevent_req_received(req);
+               return state->cli->raw_status;
+       }
+       *output = data_blob_dup_talloc(mem_ctx, state->output_buffer);
+       if (output->data == NULL) {
+               tevent_req_received(req);
+               return NT_STATUS_NO_MEMORY;
+       }
+       tevent_req_received(req);
+       return NT_STATUS_OK;
+}