summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2020-12-17 10:42:03 +0100
committerKarolin Seeger <kseeger@samba.org>2021-03-03 08:11:09 +0000
commit7a72dc8cd36f9ad58b1e0295cd9773ed8fbf7274 (patch)
treed36c856efdd4803e00c6289d321eb1320aa78f0d
parent57994ca68f21c831f0e3e292cc101fd78997bdd3 (diff)
downloadsamba-7a72dc8cd36f9ad58b1e0295cd9773ed8fbf7274.tar.gz
selftest:Samba4: avoid File::Path 'make_path' in setup_dns_hub_internal()
While spliting the build and test stages I hit strange permission problems, when a parent directory is missing, which can be avoided by using plain mkdir() on each level. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14628 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> (cherry picked from commit 719eccd445e9cc56a1c2988c4deeb39d301bcbff) (cherry picked from commit 56c2c0f651e1c038ecf87a14a7dbe478e5e58d8d)
-rwxr-xr-xselftest/target/Samba4.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 649e923ff9a..fa5b744c73b 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -17,7 +17,6 @@ use SocketWrapper;
use target::Samba;
use target::Samba3;
use Archive::Tar;
-use File::Path 'make_path';
sub new($$$$$) {
my ($classname, $SambaCtx, $bindir, $srcdir, $server_maxtime) = @_;
@@ -281,7 +280,7 @@ sub setup_dns_hub_internal($$$)
my ($self, $hostname, $prefix) = @_;
my $STDIN_READER;
- unless(-d $prefix or make_path($prefix, 0777)) {
+ unless(-d $prefix or mkdir($prefix, 0777)) {
warn("Unable to create $prefix");
return undef;
}
@@ -356,6 +355,10 @@ sub setup_dns_hub
my $hostname = "rootdnsforwarder";
+ unless(-d $prefix or mkdir($prefix, 0777)) {
+ warn("Unable to create $prefix");
+ return undef;
+ }
my $env = $self->setup_dns_hub_internal("$hostname", "$prefix/$hostname");
$self->{dns_hub_env} = $env;