diff options
author | Stefan Metzmacher <metze@samba.org> | 2019-07-30 17:16:59 +0200 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2019-08-28 09:39:46 +0200 |
commit | 1305693dba384c328651af569d46b535bb26ee0f (patch) | |
tree | 3854268561def8b384f06076841f9e6a31680cdc | |
parent | 104557f2ad5c67fab257927d9aa0931a74113ce2 (diff) | |
download | samba-1305693dba384c328651af569d46b535bb26ee0f.tar.gz |
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>
-rwxr-xr-x | selftest/target/Samba3.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 14252344175..5e9daf3eec4 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1474,6 +1474,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"; @@ -2009,14 +2012,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 |