]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: VFS: vfs_shadow_copy2. Remove symlink_fn(). No longer used.
authorJeremy Allison <jra@samba.org>
Fri, 30 Aug 2019 21:34:37 +0000 (14:34 -0700)
committerJeremy Allison <jra@samba.org>
Tue, 3 Sep 2019 21:15:44 +0000 (21:15 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
source3/modules/vfs_shadow_copy2.c

index 31f2567f1144b3a6d35a76600f64bbdbc014e37f..c3fcc1f92ebe5899f40859e7a8627e12f1fc79da 100644 (file)
@@ -1184,48 +1184,6 @@ static int shadow_copy2_renameat(vfs_handle_struct *handle,
                        smb_fname_dst);
 }
 
-
-static int shadow_copy2_symlink(vfs_handle_struct *handle,
-                       const char *link_contents,
-                       const struct smb_filename *new_smb_fname)
-{
-       time_t timestamp_old = 0;
-       time_t timestamp_new = 0;
-       char *snappath_old = NULL;
-       char *snappath_new = NULL;
-
-       if (!shadow_copy2_strip_snapshot_internal(talloc_tos(),
-                               handle,
-                               link_contents,
-                               &timestamp_old,
-                               NULL,
-                               &snappath_old,
-                               NULL)) {
-               return -1;
-       }
-       if (!shadow_copy2_strip_snapshot_internal(talloc_tos(),
-                               handle,
-                               new_smb_fname->base_name,
-                               &timestamp_new,
-                               NULL,
-                               &snappath_new,
-                               NULL)) {
-               return -1;
-       }
-       if ((timestamp_old != 0) || (timestamp_new != 0)) {
-               errno = EROFS;
-               return -1;
-       }
-       /*
-        * Don't allow symlinks on already converted paths.
-        */
-       if ((snappath_old != NULL) || (snappath_new != NULL)) {
-               errno = EROFS;
-               return -1;
-       }
-       return SMB_VFS_NEXT_SYMLINK(handle, link_contents, new_smb_fname);
-}
-
 static int shadow_copy2_symlinkat(vfs_handle_struct *handle,
                        const char *link_contents,
                        struct files_struct *dirfsp,
@@ -3198,7 +3156,6 @@ static struct vfs_fn_pointers vfs_shadow_copy2_fns = {
        .get_quota_fn = shadow_copy2_get_quota,
        .renameat_fn = shadow_copy2_renameat,
        .linkat_fn = shadow_copy2_linkat,
-       .symlink_fn = shadow_copy2_symlink,
        .symlinkat_fn = shadow_copy2_symlinkat,
        .stat_fn = shadow_copy2_stat,
        .lstat_fn = shadow_copy2_lstat,