]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: VFS: vfs_expand_msdfs. Remove readlink_fn(). No longer used.
authorJeremy Allison <jra@samba.org>
Thu, 22 Aug 2019 21:47:30 +0000 (14:47 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 23 Aug 2019 18:49:36 +0000 (18:49 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
source3/modules/vfs_expand_msdfs.c

index f3450705e1af092a77f90fa7c7e6726acdfcf546..0923489f265d5a46f9830a6ded1a6250afb6d094 100644 (file)
@@ -180,50 +180,6 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
        return new_target;
 }
 
-static int expand_msdfs_readlink(struct vfs_handle_struct *handle,
-                               const struct smb_filename *smb_fname,
-                               char *buf,
-                               size_t bufsiz)
-{
-       TALLOC_CTX *ctx = talloc_tos();
-       int result;
-       char *target = talloc_array(ctx, char, PATH_MAX+1);
-       size_t len;
-
-       if (!target) {
-               errno = ENOMEM;
-               return -1;
-       }
-       if (bufsiz == 0) {
-               errno = EINVAL;
-               return -1;
-       }
-
-       result = SMB_VFS_NEXT_READLINK(handle, smb_fname, target,
-                                      PATH_MAX);
-
-       if (result <= 0)
-               return result;
-
-       target[result] = '\0';
-
-       if ((strncmp(target, "msdfs:", 6) == 0) &&
-           (strchr_m(target, '@') != NULL)) {
-               target = expand_msdfs_target(ctx, handle->conn, target);
-               if (!target) {
-                       errno = ENOENT;
-                       return -1;
-               }
-       }
-
-       len = MIN(bufsiz, strlen(target));
-
-       memcpy(buf, target, len);
-
-       TALLOC_FREE(target);
-       return len;
-}
-
 static int expand_msdfs_readlinkat(struct vfs_handle_struct *handle,
                                files_struct *dirfsp,
                                const struct smb_filename *smb_fname,
@@ -273,7 +229,6 @@ static int expand_msdfs_readlinkat(struct vfs_handle_struct *handle,
 }
 
 static struct vfs_fn_pointers vfs_expand_msdfs_fns = {
-       .readlink_fn = expand_msdfs_readlink,
        .readlinkat_fn = expand_msdfs_readlinkat
 };