CVE-2019-10197: selftest: make fsrvp_share its own independent subdirectory

The next patch will otherwise break the fsrvp related tests.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14035

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 2587ea3125390b92009d20c57b99ecf25f7638e6..0db92552ba54eb23d735b406c4b51bc6919d7a3d 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1458,6 +1458,9 @@ sub provision($$$$$$$$$)
        my $widelinks_linkdir="$shrdir/widelinks_foo";
        push(@dirs,$widelinks_linkdir);
 
+       my $fsrvp_shrdir="$shrdir/fsrvp";
+       push(@dirs,$fsrvp_shrdir);
+
        my $shadow_tstdir="$shrdir/shadow";
        push(@dirs,$shadow_tstdir);
        my $shadow_mntdir="$shadow_tstdir/mount";
@@ -2033,14 +2036,14 @@ sub provision($$$$$$$$$)
        guest ok = yes
 
 [fsrvp_share]
-       path = $shrdir
+       path = $fsrvp_shrdir
        comment = fake shapshots using rsync
        vfs objects = shell_snap shadow_copy2
        shell_snap:check path command = $fake_snap_pl --check
        shell_snap:create command = $fake_snap_pl --create
        shell_snap:delete command = $fake_snap_pl --delete
        # a relative path here fails, the snapshot dir is no longer found
-       shadow:snapdir = $shrdir/.snapshots
+       shadow:snapdir = $fsrvp_shrdir/.snapshots
 
 [shadow1]
        path = $shadow_shrdir