From: Jeremy Allison <jra@samba.org>
Date: Fri, 9 Aug 2019 23:10:57 +0000 (-0700)
Subject: s3: VFS: vfs_streams_depot. Remove rename_fn(). No longer used.
X-Git-Tag: tdb-1.4.2~62
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=46d61e203c73092ae300e75c6c56e5769cb67609;p=samba.git

s3: VFS: vfs_streams_depot. Remove rename_fn(). No longer used.

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

diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index cd4a8d89686..2cc430a0949 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -828,58 +828,6 @@ static int streams_depot_rmdir(vfs_handle_struct *handle,
 	return ret;
 }
 
-static int streams_depot_rename(vfs_handle_struct *handle,
-				const struct smb_filename *smb_fname_src,
-				const struct smb_filename *smb_fname_dst)
-{
-	struct smb_filename *smb_fname_src_stream = NULL;
-	struct smb_filename *smb_fname_dst_stream = NULL;
-	bool src_is_stream, dst_is_stream;
-	NTSTATUS status;
-	int ret = -1;
-
-	DEBUG(10, ("streams_depot_rename called for %s => %s\n",
-		   smb_fname_str_dbg(smb_fname_src),
-		   smb_fname_str_dbg(smb_fname_dst)));
-
-	src_is_stream = is_ntfs_stream_smb_fname(smb_fname_src);
-	dst_is_stream = is_ntfs_stream_smb_fname(smb_fname_dst);
-
-	if (!src_is_stream && !dst_is_stream) {
-		return SMB_VFS_NEXT_RENAME(handle, smb_fname_src,
-					   smb_fname_dst);
-	}
-
-	/* for now don't allow renames from or to the default stream */
-	if (is_ntfs_default_stream_smb_fname(smb_fname_src) ||
-	    is_ntfs_default_stream_smb_fname(smb_fname_dst)) {
-		errno = ENOSYS;
-		goto done;
-	}
-
-	status = stream_smb_fname(handle, smb_fname_src, &smb_fname_src_stream,
-				  false);
-	if (!NT_STATUS_IS_OK(status)) {
-		errno = map_errno_from_nt_status(status);
-		goto done;
-	}
-
-	status = stream_smb_fname(handle, smb_fname_dst,
-				  &smb_fname_dst_stream, false);
-	if (!NT_STATUS_IS_OK(status)) {
-		errno = map_errno_from_nt_status(status);
-		goto done;
-	}
-
-	ret = SMB_VFS_NEXT_RENAME(handle, smb_fname_src_stream,
-				  smb_fname_dst_stream);
-
-done:
-	TALLOC_FREE(smb_fname_src_stream);
-	TALLOC_FREE(smb_fname_dst_stream);
-	return ret;
-}
-
 static int streams_depot_renameat(vfs_handle_struct *handle,
 				files_struct *srcfsp,
 				const struct smb_filename *smb_fname_src,
@@ -1117,7 +1065,6 @@ static struct vfs_fn_pointers vfs_streams_depot_fns = {
 	.lstat_fn = streams_depot_lstat,
 	.unlink_fn = streams_depot_unlink,
 	.rmdir_fn = streams_depot_rmdir,
-	.rename_fn = streams_depot_rename,
 	.renameat_fn = streams_depot_renameat,
 	.streaminfo_fn = streams_depot_streaminfo,
 };