smbd: Fix a typo in a few places
[samba.git] / source3 / modules / vfs_catia.c
index d26f797829004594e59fc44047e2c894bb9c9c16..36aa43123fd4c510a0ba511ae6e9a36442115803 100644 (file)
@@ -75,7 +75,7 @@ static struct share_mapping_entry *add_srt(int snum, const char **mappings)
 {
        struct share_mapping_entry *sme = NULL;
 
-       sme = TALLOC_ZERO(NULL, sizeof(struct share_mapping_entry));
+       sme = talloc_zero(NULL, struct share_mapping_entry);
        if (sme == NULL)
                return sme;
 
@@ -88,7 +88,7 @@ static struct share_mapping_entry *add_srt(int snum, const char **mappings)
                return sme;
        }
 
-       sme->mappings = string_replace_init_map(mappings);
+       sme->mappings = string_replace_init_map(sme, mappings);
 
        return sme;
 }
@@ -158,42 +158,17 @@ static NTSTATUS catia_string_replace_allocate(connection_struct *conn,
        return status;
 }
 
-static DIR *catia_opendir(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       const char *mask,
-                       uint32_t attr)
+static int catia_connect(struct vfs_handle_struct *handle,
+                        const char *service,
+                        const char *user)
 {
-       char *name_mapped = NULL;
-       NTSTATUS status;
-       DIR *ret;
-       struct smb_filename *mapped_smb_fname = NULL;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &name_mapped,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return NULL;
-       }
-
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-                               name_mapped,
-                               NULL,
-                               NULL,
-                               smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
-               TALLOC_FREE(mapped_smb_fname);
-               errno = ENOMEM;
-               return NULL;
-       }
-
-       ret = SMB_VFS_NEXT_OPENDIR(handle, mapped_smb_fname, mask, attr);
-
-       TALLOC_FREE(name_mapped);
-       TALLOC_FREE(mapped_smb_fname);
+       /*
+        * Unless we have an async implementation of get_dos_attributes turn
+        * this off.
+        */
+       lp_do_parameter(SNUM(handle->conn), "smbd async dosmode", "false");
 
-       return ret;
+       return SMB_VFS_NEXT_CONNECT(handle, service, user);
 }
 
 /*
@@ -311,7 +286,7 @@ static struct catia_cache *catia_validate_and_apply_cc(
 
                if ((cc->fname != fsp->fsp_name->base_name)
                    ||
-                   ((fsp->base_fsp != NULL) &&
+                   (fsp_is_alternate_stream(fsp) &&
                     (cc->base_fname != fsp->base_fsp->fsp_name->base_name)))
                {
                        CATIA_DEBUG_CC(10, cc, fsp);
@@ -337,7 +312,7 @@ static struct catia_cache *catia_validate_and_apply_cc(
 
        if ((cc->orig_fname != fsp->fsp_name->base_name)
            ||
-           ((fsp->base_fsp != NULL) &&
+           (fsp_is_alternate_stream(fsp) &&
             (cc->orig_base_fname != fsp->base_fsp->fsp_name->base_name)))
        {
                /*
@@ -356,7 +331,7 @@ static struct catia_cache *catia_validate_and_apply_cc(
         * names from the cache and mark the cc as busy.
         */
        fsp->fsp_name->base_name = cc->fname;
-       if (fsp->base_fsp != NULL) {
+       if (fsp_is_alternate_stream(fsp)) {
                fsp->base_fsp->fsp_name->base_name = cc->base_fname;
        }
 
@@ -432,7 +407,7 @@ static int catia_fetch_fsp_pre_next(TALLOC_CTX *mem_ctx,
        }
        talloc_steal(mem_ctx, cc->fname);
 
-       if (fsp->base_fsp != NULL) {
+       if (fsp_is_alternate_stream(fsp)) {
                status = catia_string_replace_allocate(
                        handle->conn,
                        fsp->base_fsp->fsp_name->base_name,
@@ -449,7 +424,7 @@ static int catia_fetch_fsp_pre_next(TALLOC_CTX *mem_ctx,
        cc->orig_fname = fsp->fsp_name->base_name;
        fsp->fsp_name->base_name = cc->fname;
 
-       if (fsp->base_fsp != NULL) {
+       if (fsp_is_alternate_stream(fsp)) {
                cc->orig_base_fname = fsp->base_fsp->fsp_name->base_name;
                fsp->base_fsp->fsp_name->base_name = cc->base_fname;
        }
@@ -463,9 +438,9 @@ static int catia_fetch_fsp_pre_next(TALLOC_CTX *mem_ctx,
 }
 
 #define CATIA_FETCH_FSP_POST_NEXT(_cc, fsp) do { \
-       int saved_errno = errno; \
+       int catia_saved_errno = errno; \
        catia_fetch_fsp_post_next((_cc), (fsp), __func__); \
-       errno = saved_errno; \
+       errno = catia_saved_errno; \
 } while(0)
 
 static void catia_fetch_fsp_post_next(struct catia_cache **_cc,
@@ -497,7 +472,7 @@ static void catia_fetch_fsp_post_next(struct catia_cache **_cc,
        *_cc = NULL;
 
        fsp->fsp_name->base_name = cc->orig_fname;
-       if (fsp->base_fsp != NULL) {
+       if (fsp_is_alternate_stream(fsp)) {
                fsp->base_fsp->fsp_name->base_name = cc->orig_base_fname;
        }
 
@@ -510,21 +485,22 @@ static void catia_fetch_fsp_post_next(struct catia_cache **_cc,
        return;
 }
 
-static int catia_open(vfs_handle_struct *handle,
-                     struct smb_filename *smb_fname,
-                     files_struct *fsp,
-                     int flags,
-                     mode_t mode)
+static int catia_openat(vfs_handle_struct *handle,
+                       const struct files_struct *dirfsp,
+                       const struct smb_filename *smb_fname_in,
+                       files_struct *fsp,
+                       const struct vfs_open_how *how)
 {
+       struct smb_filename *smb_fname = NULL;
        struct catia_cache *cc = NULL;
-       char *orig_smb_fname = smb_fname->base_name;
-       char *mapped_smb_fname = NULL;
+       char *mapped_name = NULL;
        NTSTATUS status;
        int ret;
+       int saved_errno = 0;
 
        status = catia_string_replace_allocate(handle->conn,
-                                              smb_fname->base_name,
-                                              &mapped_smb_fname,
+                                              smb_fname_in->base_name,
+                                              &mapped_name,
                                               vfs_translate_to_unix);
        if (!NT_STATUS_IS_OK(status)) {
                return -1;
@@ -532,22 +508,39 @@ static int catia_open(vfs_handle_struct *handle,
 
        ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
        if (ret != 0) {
-               TALLOC_FREE(mapped_smb_fname);
+               TALLOC_FREE(mapped_name);
                return ret;
        }
 
-       smb_fname->base_name = mapped_smb_fname;
-       ret = SMB_VFS_NEXT_OPEN(handle, smb_fname, fsp, flags, mode);
-       smb_fname->base_name = orig_smb_fname;
+       smb_fname = cp_smb_filename(talloc_tos(), smb_fname_in);
+       if (smb_fname == NULL) {
+               TALLOC_FREE(mapped_name);
+               errno = ENOMEM;
+               return -1;
+       }
+       smb_fname->base_name = mapped_name;
 
-       TALLOC_FREE(mapped_smb_fname);
+       ret = SMB_VFS_NEXT_OPENAT(handle,
+                                 dirfsp,
+                                 smb_fname,
+                                 fsp,
+                                 how);
+       if (ret == -1) {
+               saved_errno = errno;
+       }
+       TALLOC_FREE(smb_fname);
+       TALLOC_FREE(mapped_name);
        CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
-
+       if (saved_errno != 0) {
+               errno = saved_errno;
+       }
        return ret;
 }
 
-static int catia_rename(vfs_handle_struct *handle,
+static int catia_renameat(vfs_handle_struct *handle,
+                       files_struct *srcfsp,
                        const struct smb_filename *smb_fname_src,
+                       files_struct *dstfsp,
                        const struct smb_filename *smb_fname_dst)
 {
        TALLOC_CTX *ctx = talloc_tos();
@@ -588,14 +581,18 @@ static int catia_rename(vfs_handle_struct *handle,
        }
 
        smb_fname_src_tmp->base_name = src_name_mapped;
-       smb_fname_dst_tmp->base_name = dst_name_mapped; 
+       smb_fname_dst_tmp->base_name = dst_name_mapped;
        DEBUG(10, ("converted old name: %s\n",
                                smb_fname_str_dbg(smb_fname_src_tmp)));
        DEBUG(10, ("converted new name: %s\n",
                                smb_fname_str_dbg(smb_fname_dst_tmp)));
 
-       ret = SMB_VFS_NEXT_RENAME(handle, smb_fname_src_tmp,
+       ret = SMB_VFS_NEXT_RENAMEAT(handle,
+                       srcfsp,
+                       smb_fname_src_tmp,
+                       dstfsp,
                        smb_fname_dst_tmp);
+
 out:
        TALLOC_FREE(src_name_mapped);
        TALLOC_FREE(dst_name_mapped);
@@ -604,6 +601,7 @@ out:
        return ret;
 }
 
+
 static int catia_stat(vfs_handle_struct *handle,
                      struct smb_filename *smb_fname)
 {
@@ -656,72 +654,49 @@ static int catia_lstat(vfs_handle_struct *handle,
        return ret;
 }
 
-static int catia_unlink(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname)
+static int catia_unlinkat(vfs_handle_struct *handle,
+                       struct files_struct *dirfsp,
+                       const struct smb_filename *smb_fname,
+                       int flags)
 {
+       struct catia_cache *cc = NULL;
        struct smb_filename *smb_fname_tmp = NULL;
        char *name = NULL;
        NTSTATUS status;
        int ret;
 
+       ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, dirfsp, &cc);
+       if (ret != 0) {
+               return ret;
+       }
+
        status = catia_string_replace_allocate(handle->conn,
                                        smb_fname->base_name,
                                        &name, vfs_translate_to_unix);
        if (!NT_STATUS_IS_OK(status)) {
                errno = map_errno_from_nt_status(status);
-               return -1;
+               goto out;
        }
 
        /* Setup temporary smb_filename structs. */
        smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
        if (smb_fname_tmp == NULL) {
                errno = ENOMEM;
-               return -1;
+               goto out;
        }
 
        smb_fname_tmp->base_name = name;
-       ret = SMB_VFS_NEXT_UNLINK(handle, smb_fname_tmp);
+       smb_fname_tmp->fsp = smb_fname->fsp;
+
+       ret = SMB_VFS_NEXT_UNLINKAT(handle,
+                       dirfsp,
+                       smb_fname_tmp,
+                       flags);
        TALLOC_FREE(smb_fname_tmp);
        TALLOC_FREE(name);
 
-       return ret;
-}
-
-static int catia_chown(vfs_handle_struct *handle,
-                      const struct smb_filename *smb_fname,
-                      uid_t uid,
-                      gid_t gid)
-{
-       char *name = NULL;
-       NTSTATUS status;
-       int ret;
-       int saved_errno;
-       struct smb_filename *catia_smb_fname = NULL;
-
-       status = catia_string_replace_allocate(handle->conn,
-                                       smb_fname->base_name,
-                                       &name,
-                                       vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (catia_smb_fname == NULL) {
-               TALLOC_FREE(name);
-               errno = ENOMEM;
-               return -1;
-       }
-
-       ret = SMB_VFS_NEXT_CHOWN(handle, catia_smb_fname, uid, gid);
-       saved_errno = errno;
-       TALLOC_FREE(name);
-       TALLOC_FREE(catia_smb_fname);
-       errno = saved_errno;
+out:
+       CATIA_FETCH_FSP_POST_NEXT(&cc, dirfsp);
        return ret;
 }
 
@@ -747,7 +722,8 @@ static int catia_lchown(vfs_handle_struct *handle,
        catia_smb_fname = synthetic_smb_fname(talloc_tos(),
                                        name,
                                        NULL,
-                                       NULL,
+                                       &smb_fname->st,
+                                       smb_fname->twrp,
                                        smb_fname->flags);
        if (catia_smb_fname == NULL) {
                TALLOC_FREE(name);
@@ -763,80 +739,10 @@ static int catia_lchown(vfs_handle_struct *handle,
        return ret;
 }
 
-static int catia_chmod(vfs_handle_struct *handle,
+static int catia_mkdirat(vfs_handle_struct *handle,
+                       struct files_struct *dirfsp,
                        const struct smb_filename *smb_fname,
                        mode_t mode)
-{
-       char *name = NULL;
-       NTSTATUS status;
-       int ret;
-       int saved_errno;
-       struct smb_filename *catia_smb_fname = NULL;
-
-       status = catia_string_replace_allocate(handle->conn,
-                                       smb_fname->base_name,
-                                       &name,
-                                       vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (catia_smb_fname == NULL) {
-               TALLOC_FREE(name);
-               errno = ENOMEM;
-               return -1;
-       }
-
-       ret = SMB_VFS_NEXT_CHMOD(handle, catia_smb_fname, mode);
-       saved_errno = errno;
-       TALLOC_FREE(name);
-       TALLOC_FREE(catia_smb_fname);
-       errno = saved_errno;
-       return ret;
-}
-
-static int catia_rmdir(vfs_handle_struct *handle,
-                      const struct smb_filename *smb_fname)
-{
-       char *name = NULL;
-       NTSTATUS status;
-       int ret;
-       struct smb_filename *catia_smb_fname = NULL;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &name,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (catia_smb_fname == NULL) {
-               TALLOC_FREE(name);
-               errno = ENOMEM;
-               return -1;
-       }
-
-       ret = SMB_VFS_NEXT_RMDIR(handle, catia_smb_fname);
-       TALLOC_FREE(name);
-       TALLOC_FREE(catia_smb_fname);
-
-       return ret;
-}
-
-static int catia_mkdir(vfs_handle_struct *handle,
-                      const struct smb_filename *smb_fname,
-                      mode_t mode)
 {
        char *name = NULL;
        NTSTATUS status;
@@ -854,626 +760,213 @@ static int catia_mkdir(vfs_handle_struct *handle,
        catia_smb_fname = synthetic_smb_fname(talloc_tos(),
                                        name,
                                        NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (catia_smb_fname == NULL) {
-               TALLOC_FREE(name);
-               errno = ENOMEM;
-               return -1;
-       }
-
-       ret = SMB_VFS_NEXT_MKDIR(handle, catia_smb_fname, mode);
-       TALLOC_FREE(name);
-       TALLOC_FREE(catia_smb_fname);
-
-       return ret;
-}
-
-static int catia_chdir(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname)
-{
-       char *name = NULL;
-       struct smb_filename *catia_smb_fname = NULL;
-       NTSTATUS status;
-       int ret;
-
-       status = catia_string_replace_allocate(handle->conn,
-                                       smb_fname->base_name,
-                                       &name,
-                                       vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-
-       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       name,
-                                       NULL,
-                                       NULL,
+                                       &smb_fname->st,
+                                       smb_fname->twrp,
                                        smb_fname->flags);
        if (catia_smb_fname == NULL) {
                TALLOC_FREE(name);
                errno = ENOMEM;
                return -1;
        }
-       ret = SMB_VFS_NEXT_CHDIR(handle, catia_smb_fname);
-       TALLOC_FREE(name);
-       TALLOC_FREE(catia_smb_fname);
-
-       return ret;
-}
-
-static int catia_ntimes(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       struct smb_file_time *ft)
-{
-       struct smb_filename *smb_fname_tmp = NULL;
-       char *name = NULL;
-       NTSTATUS status;
-       int ret;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &name, vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-
-       smb_fname_tmp = cp_smb_filename(talloc_tos(), smb_fname);
-       if (smb_fname_tmp == NULL) {
-               errno = ENOMEM;
-               return -1;
-       }
-
-       smb_fname_tmp->base_name = name;
-       ret = SMB_VFS_NEXT_NTIMES(handle, smb_fname_tmp, ft);
-       TALLOC_FREE(name);
-       TALLOC_FREE(smb_fname_tmp);
-
-       return ret;
-}
-
-static struct smb_filename *
-catia_realpath(vfs_handle_struct *handle,
-               TALLOC_CTX *ctx,
-               const struct smb_filename *smb_fname)
-{
-       char *mapped_name = NULL;
-       struct smb_filename *catia_smb_fname = NULL;
-       struct smb_filename *return_fname = NULL;
-       NTSTATUS status;
-
-       status = catia_string_replace_allocate(handle->conn,
-                                       smb_fname->base_name,
-                                       &mapped_name, vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return NULL;
-       }
-
-       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       mapped_name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (catia_smb_fname == NULL) {
-               TALLOC_FREE(mapped_name);
-               errno = ENOMEM;
-               return NULL;
-       }
-       return_fname = SMB_VFS_NEXT_REALPATH(handle, ctx, catia_smb_fname);
-       TALLOC_FREE(mapped_name);
-       TALLOC_FREE(catia_smb_fname);
-       return return_fname;
-}
-
-static int catia_chflags(struct vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       unsigned int flags)
-{
-       char *name = NULL;
-       struct smb_filename *catia_smb_fname = NULL;
-       NTSTATUS status;
-       int ret;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &name,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (catia_smb_fname == NULL) {
-               TALLOC_FREE(name);
-               errno = ENOMEM;
-               return -1;
-       }
-
-       ret = SMB_VFS_NEXT_CHFLAGS(handle, catia_smb_fname, flags);
-       TALLOC_FREE(name);
-       TALLOC_FREE(catia_smb_fname);
-
-       return ret;
-}
-
-static NTSTATUS
-catia_streaminfo(struct vfs_handle_struct *handle,
-                struct files_struct *fsp,
-                const struct smb_filename *smb_fname,
-                TALLOC_CTX *mem_ctx,
-                unsigned int *_num_streams,
-                struct stream_struct **_streams)
-{
-       char *mapped_name = NULL;
-       NTSTATUS status;
-       unsigned int i;
-       struct smb_filename *catia_smb_fname = NULL;
-       unsigned int num_streams = 0;
-       struct stream_struct *streams = NULL;
-
-       *_num_streams = 0;
-       *_streams = NULL;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &mapped_name,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return status;
-       }
-
-       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       mapped_name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (catia_smb_fname == NULL) {
-               TALLOC_FREE(mapped_name);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       status = SMB_VFS_NEXT_STREAMINFO(handle, fsp, catia_smb_fname,
-                                        mem_ctx, &num_streams, &streams);
-       TALLOC_FREE(mapped_name);
-       TALLOC_FREE(catia_smb_fname);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       /*
-        * Translate stream names just like the base names
-        */
-       for (i = 0; i < num_streams; i++) {
-               /*
-                * Strip ":" prefix and ":$DATA" suffix to get a
-                * "pure" stream name and only translate that.
-                */
-               void *old_ptr = streams[i].name;
-               char *stream_name = streams[i].name + 1;
-               char *stream_type = strrchr_m(stream_name, ':');
-
-               if (stream_type != NULL) {
-                       *stream_type = '\0';
-                       stream_type += 1;
-               }
-
-               status = catia_string_replace_allocate(handle->conn, stream_name,
-                                                      &mapped_name, vfs_translate_to_windows);
-               if (!NT_STATUS_IS_OK(status)) {
-                       TALLOC_FREE(streams);
-                       return status;
-               }
-
-               if (stream_type != NULL) {
-                       streams[i].name = talloc_asprintf(streams, ":%s:%s",
-                                                         mapped_name, stream_type);
-               } else {
-                       streams[i].name = talloc_asprintf(streams, ":%s",
-                                                         mapped_name);
-               }
-               TALLOC_FREE(mapped_name);
-               TALLOC_FREE(old_ptr);
-               if (streams[i].name == NULL) {
-                       TALLOC_FREE(streams);
-                       return NT_STATUS_NO_MEMORY;
-               }
-       }
-
-       *_num_streams = num_streams;
-       *_streams = streams;
-       return NT_STATUS_OK;
-}
-
-static NTSTATUS
-catia_get_nt_acl(struct vfs_handle_struct *handle,
-                const struct smb_filename *smb_fname,
-                uint32_t security_info,
-                TALLOC_CTX *mem_ctx,
-                struct security_descriptor **ppdesc)
-{
-       char *mapped_name = NULL;
-       const char *path = smb_fname->base_name;
-       struct smb_filename *mapped_smb_fname = NULL;
-       NTSTATUS status;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               path, &mapped_name, vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return status;
-       }
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       mapped_name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
-               TALLOC_FREE(mapped_name);
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       status = SMB_VFS_NEXT_GET_NT_ACL(handle, mapped_smb_fname,
-                                        security_info, mem_ctx, ppdesc);
-       TALLOC_FREE(mapped_name);
-       TALLOC_FREE(mapped_smb_fname);
-
-       return status;
-}
-
-static SMB_ACL_T
-catia_sys_acl_get_file(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       SMB_ACL_TYPE_T type,
-                       TALLOC_CTX *mem_ctx)
-{
-       char *mapped_name = NULL;
-       struct smb_filename *mapped_smb_fname = NULL;
-       NTSTATUS status;
-       SMB_ACL_T ret;
-       int saved_errno = 0;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &mapped_name,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return (SMB_ACL_T)NULL;
-       }
-
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       mapped_name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
-               TALLOC_FREE(mapped_name);
-               errno = ENOMEM;
-               return (SMB_ACL_T)NULL;
-       }
-
-       ret = SMB_VFS_NEXT_SYS_ACL_GET_FILE(handle, mapped_smb_fname,
-                       type, mem_ctx);
-       if (ret == (SMB_ACL_T)NULL) {
-               saved_errno = errno;
-       }
-       TALLOC_FREE(mapped_smb_fname);
-       TALLOC_FREE(mapped_name);
-       if (saved_errno != 0) {
-               errno = saved_errno;
-       }
-       return ret;
-}
-
-static int
-catia_sys_acl_set_file(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       SMB_ACL_TYPE_T type,
-                       SMB_ACL_T theacl)
-{
-       struct smb_filename *mapped_smb_fname = NULL;
-       int saved_errno = 0;
-       char *mapped_name = NULL;
-       NTSTATUS status;
-       int ret;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &mapped_name,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       mapped_name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
-               TALLOC_FREE(mapped_name);
-               errno = ENOMEM;
-               return -1;
-       }
-
-       ret = SMB_VFS_NEXT_SYS_ACL_SET_FILE(handle, mapped_smb_fname,
-                       type, theacl);
-       if (ret == -1) {
-               saved_errno = errno;
-       }
-       TALLOC_FREE(mapped_smb_fname);
-       TALLOC_FREE(mapped_name);
-       if (saved_errno != 0) {
-               errno = saved_errno;
-       }
-       return ret;
-}
-
-static int
-catia_sys_acl_delete_def_file(vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname)
-{
-       struct smb_filename *mapped_smb_fname = NULL;
-       int saved_errno = 0;
-       char *mapped_name = NULL;
-       NTSTATUS status;
-       int ret;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &mapped_name,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       mapped_name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
-               TALLOC_FREE(mapped_name);
-               errno = ENOMEM;
-               return -1;
-       }
-       ret = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, mapped_smb_fname);
-       if (ret == -1) {
-               saved_errno = errno;
-       }
-       TALLOC_FREE(mapped_smb_fname);
-       TALLOC_FREE(mapped_name);
-       if (saved_errno != 0) {
-               errno = saved_errno;
-       }
-       return ret;
-}
-
-static ssize_t
-catia_getxattr(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       const char *name,
-                       void *value,
-                       size_t size)
-{
-       struct smb_filename *mapped_smb_fname = NULL;
-       char *mapped_name = NULL;
-       char *mapped_ea_name = NULL;
-       NTSTATUS status;
-       ssize_t ret;
-       int saved_errno = 0;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &mapped_name,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-
-       status = catia_string_replace_allocate(handle->conn,
-                               name, &mapped_ea_name, vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(mapped_name);
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       mapped_name,
-                                       NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
-               TALLOC_FREE(mapped_name);
-               TALLOC_FREE(mapped_ea_name);
-               errno = ENOMEM;
-               return -1;
-       }
 
-       ret = SMB_VFS_NEXT_GETXATTR(handle, mapped_smb_fname,
-                               mapped_ea_name, value, size);
-       if (ret == -1) {
-               saved_errno = errno;
-       }
-       TALLOC_FREE(mapped_name);
-       TALLOC_FREE(mapped_ea_name);
-       TALLOC_FREE(mapped_smb_fname);
-       if (saved_errno != 0) {
-               errno = saved_errno;
-       }
+       ret = SMB_VFS_NEXT_MKDIRAT(handle,
+                       dirfsp,
+                       catia_smb_fname,
+                       mode);
+       TALLOC_FREE(name);
+       TALLOC_FREE(catia_smb_fname);
 
        return ret;
 }
 
-static ssize_t
-catia_listxattr(vfs_handle_struct *handle,
-               const struct smb_filename *smb_fname,
-               char *list, size_t size)
+static int catia_chdir(vfs_handle_struct *handle,
+                       const struct smb_filename *smb_fname)
 {
-       struct smb_filename *mapped_smb_fname = NULL;
-       char *mapped_name = NULL;
+       char *name = NULL;
+       struct smb_filename *catia_smb_fname = NULL;
        NTSTATUS status;
-       ssize_t ret;
-       int saved_errno = 0;
+       int ret;
 
        status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &mapped_name,
-                               vfs_translate_to_unix);
+                                       smb_fname->base_name,
+                                       &name,
+                                       vfs_translate_to_unix);
        if (!NT_STATUS_IS_OK(status)) {
                errno = map_errno_from_nt_status(status);
                return -1;
        }
 
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                       mapped_name,
-                                       NULL,
+       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
+                                       name,
                                        NULL,
+                                       &smb_fname->st,
+                                       smb_fname->twrp,
                                        smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
-               TALLOC_FREE(mapped_name);
+       if (catia_smb_fname == NULL) {
+               TALLOC_FREE(name);
                errno = ENOMEM;
                return -1;
        }
+       ret = SMB_VFS_NEXT_CHDIR(handle, catia_smb_fname);
+       TALLOC_FREE(name);
+       TALLOC_FREE(catia_smb_fname);
 
-       ret = SMB_VFS_NEXT_LISTXATTR(handle, mapped_smb_fname, list, size);
-       if (ret == -1) {
-               saved_errno = errno;
-       }
-       TALLOC_FREE(mapped_name);
-       TALLOC_FREE(mapped_smb_fname);
-       if (saved_errno != 0) {
-               errno = saved_errno;
+       return ret;
+}
+
+static int catia_fntimes(vfs_handle_struct *handle,
+                        files_struct *fsp,
+                        struct smb_file_time *ft)
+{
+       struct catia_cache *cc = NULL;
+       int ret;
+
+       ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
+       if (ret != 0) {
+               return ret;
        }
 
+       ret = SMB_VFS_NEXT_FNTIMES(handle, fsp, ft);
+
+       CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
+
        return ret;
 }
 
-static int
-catia_removexattr(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       const char *name)
+static struct smb_filename *
+catia_realpath(vfs_handle_struct *handle,
+               TALLOC_CTX *ctx,
+               const struct smb_filename *smb_fname)
 {
-       struct smb_filename *mapped_smb_fname = NULL;
        char *mapped_name = NULL;
-       char *mapped_ea_name = NULL;
+       struct smb_filename *catia_smb_fname = NULL;
+       struct smb_filename *return_fname = NULL;
        NTSTATUS status;
-       ssize_t ret;
-       int saved_errno = 0;
-
-       status = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &mapped_name,
-                               vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
 
        status = catia_string_replace_allocate(handle->conn,
-                               name, &mapped_ea_name, vfs_translate_to_unix);
+                                       smb_fname->base_name,
+                                       &mapped_name, vfs_translate_to_unix);
        if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(mapped_name);
                errno = map_errno_from_nt_status(status);
-               return -1;
+               return NULL;
        }
 
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
+       catia_smb_fname = synthetic_smb_fname(talloc_tos(),
                                        mapped_name,
                                        NULL,
-                                       NULL,
+                                       &smb_fname->st,
+                                       smb_fname->twrp,
                                        smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
+       if (catia_smb_fname == NULL) {
                TALLOC_FREE(mapped_name);
-               TALLOC_FREE(mapped_ea_name);
                errno = ENOMEM;
-               return -1;
-       }
-
-       ret = SMB_VFS_NEXT_REMOVEXATTR(handle, mapped_smb_fname,
-                               mapped_ea_name);
-       if (ret == -1) {
-               saved_errno = errno;
+               return NULL;
        }
+       return_fname = SMB_VFS_NEXT_REALPATH(handle, ctx, catia_smb_fname);
        TALLOC_FREE(mapped_name);
-       TALLOC_FREE(mapped_ea_name);
-       TALLOC_FREE(mapped_smb_fname);
-       if (saved_errno != 0) {
-               errno = saved_errno;
-       }
-
-       return ret;
+       TALLOC_FREE(catia_smb_fname);
+       return return_fname;
 }
 
-static int
-catia_setxattr(vfs_handle_struct *handle,
-                       const struct smb_filename *smb_fname,
-                       const char *name,
-                       const void *value,
-                       size_t size,
-                       int flags)
+static NTSTATUS
+catia_fstreaminfo(struct vfs_handle_struct *handle,
+                struct files_struct *fsp,
+                TALLOC_CTX *mem_ctx,
+                unsigned int *_num_streams,
+                struct stream_struct **_streams)
 {
-       struct smb_filename *mapped_smb_fname = NULL;
        char *mapped_name = NULL;
-       char *mapped_ea_name = NULL;
        NTSTATUS status;
-       ssize_t ret;
-       int saved_errno = 0;
+       unsigned int i;
+       struct smb_filename *catia_smb_fname = NULL;
+       struct smb_filename *smb_fname = NULL;
+       unsigned int num_streams = 0;
+       struct stream_struct *streams = NULL;
+
+       smb_fname = fsp->fsp_name;
+       *_num_streams = 0;
+       *_streams = NULL;
 
        status = catia_string_replace_allocate(handle->conn,
                                smb_fname->base_name,
                                &mapped_name,
                                vfs_translate_to_unix);
        if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return -1;
-       }
-
-       status = catia_string_replace_allocate(handle->conn,
-                               name, &mapped_ea_name, vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(mapped_name);
-               errno = map_errno_from_nt_status(status);
-               return -1;
+               return status;
        }
 
-       mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
+       status = synthetic_pathref(talloc_tos(),
+                                       handle->conn->cwd_fsp,
                                        mapped_name,
                                        NULL,
-                                       NULL,
-                                       smb_fname->flags);
-       if (mapped_smb_fname == NULL) {
+                                       &smb_fname->st,
+                                       smb_fname->twrp,
+                                       smb_fname->flags,
+                                       &catia_smb_fname);
+
+       if (!NT_STATUS_IS_OK(status)) {
                TALLOC_FREE(mapped_name);
-               TALLOC_FREE(mapped_ea_name);
-               errno = ENOMEM;
-               return -1;
+               return status;
        }
 
-       ret = SMB_VFS_NEXT_SETXATTR(handle, mapped_smb_fname, mapped_ea_name,
-                       value, size, flags);
-       if (ret == -1) {
-               saved_errno = errno;
-       }
+       status = SMB_VFS_NEXT_FSTREAMINFO(handle,
+                                         catia_smb_fname->fsp,
+                                         mem_ctx,
+                                         &num_streams,
+                                         &streams);
        TALLOC_FREE(mapped_name);
-       TALLOC_FREE(mapped_ea_name);
-       TALLOC_FREE(mapped_smb_fname);
-       if (saved_errno != 0) {
-               errno = saved_errno;
+       TALLOC_FREE(catia_smb_fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
        }
 
-       return ret;
+       /*
+        * Translate stream names just like the base names
+        */
+       for (i = 0; i < num_streams; i++) {
+               /*
+                * Strip ":" prefix and ":$DATA" suffix to get a
+                * "pure" stream name and only translate that.
+                */
+               void *old_ptr = streams[i].name;
+               char *stream_name = streams[i].name + 1;
+               char *stream_type = strrchr_m(stream_name, ':');
+
+               if (stream_type != NULL) {
+                       *stream_type = '\0';
+                       stream_type += 1;
+               }
+
+               status = catia_string_replace_allocate(handle->conn,
+                                               stream_name,
+                                               &mapped_name,
+                                               vfs_translate_to_windows);
+               if (!NT_STATUS_IS_OK(status)) {
+                       TALLOC_FREE(streams);
+                       return status;
+               }
+
+               if (stream_type != NULL) {
+                       streams[i].name = talloc_asprintf(streams,
+                                                         ":%s:%s",
+                                                         mapped_name,
+                                                         stream_type);
+               } else {
+                       streams[i].name = talloc_asprintf(streams,
+                                                         ":%s",
+                                                         mapped_name);
+               }
+               TALLOC_FREE(mapped_name);
+               TALLOC_FREE(old_ptr);
+               if (streams[i].name == NULL) {
+                       TALLOC_FREE(streams);
+                       return NT_STATUS_NO_MEMORY;
+               }
+       }
+
+       *_num_streams = num_streams;
+       *_streams = streams;
+       return NT_STATUS_OK;
 }
 
 static int catia_fstat(vfs_handle_struct *handle,
@@ -1672,6 +1165,7 @@ static int catia_fsetxattr(struct vfs_handle_struct *handle,
 
 static SMB_ACL_T catia_sys_acl_get_fd(vfs_handle_struct *handle,
                                      files_struct *fsp,
+                                     SMB_ACL_TYPE_T type,
                                      TALLOC_CTX *mem_ctx)
 {
        struct catia_cache *cc = NULL;
@@ -1683,7 +1177,7 @@ static SMB_ACL_T catia_sys_acl_get_fd(vfs_handle_struct *handle,
                return NULL;
        }
 
-       result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, mem_ctx);
+       result = SMB_VFS_NEXT_SYS_ACL_GET_FD(handle, fsp, type, mem_ctx);
 
        CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
 
@@ -1714,6 +1208,7 @@ static int catia_sys_acl_blob_get_fd(vfs_handle_struct *handle,
 
 static int catia_sys_acl_set_fd(vfs_handle_struct *handle,
                                files_struct *fsp,
+                               SMB_ACL_TYPE_T type,
                                SMB_ACL_T theacl)
 {
        struct catia_cache *cc = NULL;
@@ -1724,26 +1219,7 @@ static int catia_sys_acl_set_fd(vfs_handle_struct *handle,
                return ret;
        }
 
-       ret = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, theacl);
-
-       CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
-
-       return ret;
-}
-
-static int catia_fchmod_acl(vfs_handle_struct *handle,
-                           files_struct *fsp,
-                           mode_t mode)
-{
-       struct catia_cache *cc = NULL;
-       int ret;
-
-       ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
-       if (ret != 0) {
-               return ret;
-       }
-
-       ret = SMB_VFS_NEXT_FCHMOD_ACL(handle, fsp, mode);
+       ret = SMB_VFS_NEXT_SYS_ACL_SET_FD(handle, fsp, type, theacl);
 
        CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
 
@@ -2122,7 +1598,7 @@ static bool catia_lock(vfs_handle_struct *handle,
 
        ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
        if (ret != 0) {
-               return -1;
+               return false;
        }
 
        ok = SMB_VFS_NEXT_LOCK(handle, fsp, op, offset, count, type);
@@ -2132,10 +1608,10 @@ static bool catia_lock(vfs_handle_struct *handle,
        return ok;
 }
 
-static int catia_kernel_flock(struct vfs_handle_struct *handle,
-                             struct files_struct *fsp,
-                             uint32_t share_mode,
-                             uint32_t access_mask)
+static int catia_filesystem_sharemode(struct vfs_handle_struct *handle,
+                                     struct files_struct *fsp,
+                                     uint32_t share_access,
+                                     uint32_t access_mask)
 {
        struct catia_cache *cc = NULL;
        int ret;
@@ -2145,7 +1621,10 @@ static int catia_kernel_flock(struct vfs_handle_struct *handle,
                return -1;
        }
 
-       ret = SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask);
+       ret = SMB_VFS_NEXT_FILESYSTEM_SHAREMODE(handle,
+                                               fsp,
+                                               share_access,
+                                               access_mask);
 
        CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
 
@@ -2184,7 +1663,7 @@ static bool catia_getlock(vfs_handle_struct *handle,
 
        ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
        if (ret != 0) {
-               return -1;
+               return false;
        }
 
        ok = SMB_VFS_NEXT_GETLOCK(handle, fsp, poffset, pcount, ptype, ppid);
@@ -2204,7 +1683,7 @@ static bool catia_strict_lock_check(struct vfs_handle_struct *handle,
 
        ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
        if (ret != 0) {
-               return -1;
+               return false;
        }
 
        ok = SMB_VFS_NEXT_STRICT_LOCK_CHECK(handle, fsp, plock);
@@ -2250,57 +1729,26 @@ static NTSTATUS catia_fsctl(struct vfs_handle_struct *handle,
        return result;
 }
 
-static NTSTATUS catia_get_compression(vfs_handle_struct *handle,
+static NTSTATUS catia_fget_compression(vfs_handle_struct *handle,
                                      TALLOC_CTX *mem_ctx,
                                      struct files_struct *fsp,
-                                     struct smb_filename *smb_fname,
                                      uint16_t *_compression_fmt)
 {
        NTSTATUS result;
        struct catia_cache *cc = NULL;
        int ret;
-       struct smb_filename *mapped_smb_fname = NULL;
-       char *mapped_name = NULL;
-
-       if (fsp != NULL) {
-               ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
-               if (ret != 0) {
-                       return map_nt_error_from_unix(errno);
-               }
-               mapped_smb_fname = fsp->fsp_name;
-       } else {
-               result = catia_string_replace_allocate(handle->conn,
-                               smb_fname->base_name,
-                               &mapped_name,
-                               vfs_translate_to_unix);
-               if (!NT_STATUS_IS_OK(result)) {
-                       return result;
-               }
-
-               mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-                                               mapped_name,
-                                               NULL,
-                                               NULL,
-                                               smb_fname->flags);
-               if (mapped_smb_fname == NULL) {
-                       TALLOC_FREE(mapped_name);
-                       return NT_STATUS_NO_MEMORY;
-               }
 
-               TALLOC_FREE(mapped_name);
+       ret = CATIA_FETCH_FSP_PRE_NEXT(talloc_tos(), handle, fsp, &cc);
+       if (ret != 0) {
+               return map_nt_error_from_unix(errno);
        }
 
-       result = SMB_VFS_NEXT_GET_COMPRESSION(handle,
+       result = SMB_VFS_NEXT_FGET_COMPRESSION(handle,
                                        mem_ctx,
                                        fsp,
-                                       mapped_smb_fname,
                                        _compression_fmt);
 
-       if (fsp != NULL) {
-               CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
-       } else {
-               TALLOC_FREE(mapped_smb_fname);
-       }
+       CATIA_FETCH_FSP_POST_NEXT(&cc, fsp);
 
        return result;
 }
@@ -2327,37 +1775,11 @@ static NTSTATUS catia_set_compression(vfs_handle_struct *handle,
        return result;
 }
 
-static NTSTATUS catia_readdir_attr(struct vfs_handle_struct *handle,
-                                  const struct smb_filename *smb_fname_in,
-                                  TALLOC_CTX *mem_ctx,
-                                  struct readdir_attr_data **pattr_data)
-{
-       struct smb_filename *smb_fname;
-       char *fname = NULL;
-       NTSTATUS status;
-
-       status = catia_string_replace_allocate(handle->conn,
-                                              smb_fname_in->base_name,
-                                              &fname,
-                                              vfs_translate_to_unix);
-       if (!NT_STATUS_IS_OK(status)) {
-               errno = map_errno_from_nt_status(status);
-               return status;
-       }
-
-       smb_fname = synthetic_smb_fname(talloc_tos(), fname, NULL,
-                                       &smb_fname_in->st, 0);
-
-       status = SMB_VFS_NEXT_READDIR_ATTR(handle, smb_fname, mem_ctx, pattr_data);
-
-       TALLOC_FREE(smb_fname);
-       TALLOC_FREE(fname);
-       return status;
-}
-
-static NTSTATUS catia_get_dos_attributes(struct vfs_handle_struct *handle,
-                                        struct smb_filename *smb_fname,
-                                        uint32_t *dosmode)
+static NTSTATUS catia_create_dfs_pathat(struct vfs_handle_struct *handle,
+                       struct files_struct *dirfsp,
+                       const struct smb_filename *smb_fname,
+                       const struct referral *reflist,
+                       size_t referral_count)
 {
        char *mapped_name = NULL;
        const char *path = smb_fname->base_name;
@@ -2365,7 +1787,9 @@ static NTSTATUS catia_get_dos_attributes(struct vfs_handle_struct *handle,
        NTSTATUS status;
 
        status = catia_string_replace_allocate(handle->conn,
-                               path, &mapped_name, vfs_translate_to_unix);
+                                       path,
+                                       &mapped_name,
+                                       vfs_translate_to_unix);
        if (!NT_STATUS_IS_OK(status)) {
                errno = map_errno_from_nt_status(status);
                return status;
@@ -2373,25 +1797,30 @@ static NTSTATUS catia_get_dos_attributes(struct vfs_handle_struct *handle,
        mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
                                        mapped_name,
                                        NULL,
-                                       NULL,
+                                       &smb_fname->st,
+                                       smb_fname->twrp,
                                        smb_fname->flags);
        if (mapped_smb_fname == NULL) {
                TALLOC_FREE(mapped_name);
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = SMB_VFS_NEXT_GET_DOS_ATTRIBUTES(handle,
-                                                mapped_smb_fname,
-                                                dosmode);
+       status = SMB_VFS_NEXT_CREATE_DFS_PATHAT(handle,
+                                       dirfsp,
+                                       mapped_smb_fname,
+                                       reflist,
+                                       referral_count);
        TALLOC_FREE(mapped_name);
        TALLOC_FREE(mapped_smb_fname);
-
        return status;
 }
 
-static NTSTATUS catia_set_dos_attributes(struct vfs_handle_struct *handle,
-                                        const struct smb_filename *smb_fname,
-                                        uint32_t dosmode)
+static NTSTATUS catia_read_dfs_pathat(struct vfs_handle_struct *handle,
+                       TALLOC_CTX *mem_ctx,
+                       struct files_struct *dirfsp,
+                       struct smb_filename *smb_fname,
+                       struct referral **ppreflist,
+                       size_t *preferral_count)
 {
        char *mapped_name = NULL;
        const char *path = smb_fname->base_name;
@@ -2399,7 +1828,9 @@ static NTSTATUS catia_set_dos_attributes(struct vfs_handle_struct *handle,
        NTSTATUS status;
 
        status = catia_string_replace_allocate(handle->conn,
-                               path, &mapped_name, vfs_translate_to_unix);
+                                       path,
+                                       &mapped_name,
+                                       vfs_translate_to_unix);
        if (!NT_STATUS_IS_OK(status)) {
                errno = map_errno_from_nt_status(status);
                return status;
@@ -2407,31 +1838,38 @@ static NTSTATUS catia_set_dos_attributes(struct vfs_handle_struct *handle,
        mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
                                        mapped_name,
                                        NULL,
-                                       NULL,
+                                       &smb_fname->st,
+                                       smb_fname->twrp,
                                        smb_fname->flags);
        if (mapped_smb_fname == NULL) {
                TALLOC_FREE(mapped_name);
                return NT_STATUS_NO_MEMORY;
        }
 
-       status = SMB_VFS_NEXT_SET_DOS_ATTRIBUTES(handle,
-                                                mapped_smb_fname,
-                                                dosmode);
+       status = SMB_VFS_NEXT_READ_DFS_PATHAT(handle,
+                                       mem_ctx,
+                                       dirfsp,
+                                       mapped_smb_fname,
+                                       ppreflist,
+                                       preferral_count);
+       if (NT_STATUS_IS_OK(status)) {
+               /* Return any stat(2) info. */
+               smb_fname->st = mapped_smb_fname->st;
+       }
+
        TALLOC_FREE(mapped_name);
        TALLOC_FREE(mapped_smb_fname);
-
        return status;
 }
 
 static struct vfs_fn_pointers vfs_catia_fns = {
+       .connect_fn = catia_connect,
+
        /* Directory operations */
-       .mkdir_fn = catia_mkdir,
-       .rmdir_fn = catia_rmdir,
-       .opendir_fn = catia_opendir,
-       .readdir_attr_fn = catia_readdir_attr,
+       .mkdirat_fn = catia_mkdirat,
 
        /* File operations */
-       .open_fn = catia_open,
+       .openat_fn = catia_openat,
        .pread_fn = catia_pread,
        .pread_send_fn = catia_pread_send,
        .pread_recv_fn = catia_pread_recv,
@@ -2439,59 +1877,50 @@ static struct vfs_fn_pointers vfs_catia_fns = {
        .pwrite_send_fn = catia_pwrite_send,
        .pwrite_recv_fn = catia_pwrite_recv,
        .lseek_fn = catia_lseek,
-       .rename_fn = catia_rename,
+       .renameat_fn = catia_renameat,
        .fsync_send_fn = catia_fsync_send,
        .fsync_recv_fn = catia_fsync_recv,
        .stat_fn = catia_stat,
        .fstat_fn = catia_fstat,
        .lstat_fn = catia_lstat,
-       .unlink_fn = catia_unlink,
-       .chmod_fn = catia_chmod,
+       .unlinkat_fn = catia_unlinkat,
        .fchmod_fn = catia_fchmod,
-       .chown_fn = catia_chown,
        .fchown_fn = catia_fchown,
        .lchown_fn = catia_lchown,
        .chdir_fn = catia_chdir,
-       .ntimes_fn = catia_ntimes,
+       .fntimes_fn = catia_fntimes,
        .ftruncate_fn = catia_ftruncate,
        .fallocate_fn = catia_fallocate,
        .lock_fn = catia_lock,
-       .kernel_flock_fn = catia_kernel_flock,
+       .filesystem_sharemode_fn = catia_filesystem_sharemode,
        .linux_setlease_fn = catia_linux_setlease,
        .getlock_fn = catia_getlock,
        .realpath_fn = catia_realpath,
-       .chflags_fn = catia_chflags,
-       .streaminfo_fn = catia_streaminfo,
+       .fstreaminfo_fn = catia_fstreaminfo,
        .strict_lock_check_fn = catia_strict_lock_check,
        .translate_name_fn = catia_translate_name,
        .fsctl_fn = catia_fsctl,
-       .get_dos_attributes_fn = catia_get_dos_attributes,
-       .set_dos_attributes_fn = catia_set_dos_attributes,
+       .get_dos_attributes_send_fn = vfs_not_implemented_get_dos_attributes_send,
+       .get_dos_attributes_recv_fn = vfs_not_implemented_get_dos_attributes_recv,
        .fset_dos_attributes_fn = catia_fset_dos_attributes,
        .fget_dos_attributes_fn = catia_fget_dos_attributes,
-       .get_compression_fn = catia_get_compression,
+       .fget_compression_fn = catia_fget_compression,
        .set_compression_fn = catia_set_compression,
+       .create_dfs_pathat_fn = catia_create_dfs_pathat,
+       .read_dfs_pathat_fn = catia_read_dfs_pathat,
 
        /* NT ACL operations. */
-       .get_nt_acl_fn = catia_get_nt_acl,
        .fget_nt_acl_fn = catia_fget_nt_acl,
        .fset_nt_acl_fn = catia_fset_nt_acl,
 
        /* POSIX ACL operations. */
-       .fchmod_acl_fn = catia_fchmod_acl,
-
-       .sys_acl_get_file_fn = catia_sys_acl_get_file,
        .sys_acl_get_fd_fn = catia_sys_acl_get_fd,
        .sys_acl_blob_get_fd_fn = catia_sys_acl_blob_get_fd,
-       .sys_acl_set_file_fn = catia_sys_acl_set_file,
        .sys_acl_set_fd_fn = catia_sys_acl_set_fd,
-       .sys_acl_delete_def_file_fn = catia_sys_acl_delete_def_file,
 
        /* EA operations. */
-       .getxattr_fn = catia_getxattr,
-       .listxattr_fn = catia_listxattr,
-       .removexattr_fn = catia_removexattr,
-       .setxattr_fn = catia_setxattr,
+       .getxattrat_send_fn = vfs_not_implemented_getxattrat_send,
+       .getxattrat_recv_fn = vfs_not_implemented_getxattrat_recv,
        .fgetxattr_fn = catia_fgetxattr,
        .flistxattr_fn = catia_flistxattr,
        .fremovexattr_fn = catia_fremovexattr,