From: Jeremy Allison <jra@samba.org>
Date: Thu, 22 Aug 2019 21:47:30 +0000 (-0700)
Subject: s3: VFS: vfs_expand_msdfs. Remove readlink_fn(). No longer used.
X-Git-Tag: tevent-0.10.1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fe9845b313090aa4db8cc12f74a13af87dc92bb;p=thirdparty%2Fsamba.git

s3: VFS: vfs_expand_msdfs. Remove readlink_fn(). No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
---

diff --git a/source3/modules/vfs_expand_msdfs.c b/source3/modules/vfs_expand_msdfs.c
index f3450705e1a..0923489f265 100644
--- a/source3/modules/vfs_expand_msdfs.c
+++ b/source3/modules/vfs_expand_msdfs.c
@@ -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
 };