50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From 03a0719d6d5c1a81b44bc3cedc76563a1eb04491 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Metzmacher <metze@samba.org>
|
|
Date: Tue, 30 Jul 2019 17:16:59 +0200
|
|
Subject: [PATCH 4/6] 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>
|
|
---
|
|
selftest/target/Samba3.pm | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
|
|
index 9d88253c9fe7..f7eb314138a0 100755
|
|
--- a/selftest/target/Samba3.pm
|
|
+++ b/selftest/target/Samba3.pm
|
|
@@ -1540,6 +1540,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";
|
|
@@ -2083,14 +2086,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
|
|
--
|
|
2.17.1
|
|
|