sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

selftest: Pass extra_provision_options to provision_raw_prepare()

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
This commit is contained in:
Andreas Schneider 2020-03-13 13:58:57 +01:00 committed by Andreas Schneider
parent 865670616b
commit 8c5da549f6
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
selftest/target/Samba4.pm
View File

@ -471,11 +471,20 @@ sub setup_trust($$$$$)
return $localenv
}
sub provision_raw_prepare($$$$$$$$$$$$)
sub provision_raw_prepare($$$$$$$$$$$$$)
{
my ($self, $prefix, $server_role, $hostname,
$domain, $realm, $samsid, $functional_level,
$password, $kdc_ipv4, $kdc_ipv6) = @_;
my ($self,
$prefix,
$server_role,
$hostname,
$domain,
$realm,
$samsid,
$functional_level,
$password,
$kdc_ipv4,
$kdc_ipv6,
$extra_provision_options) = @_;
my $ctx;
my $python_cmd = "";
if (defined $ENV{PYTHON}) {
@ -635,6 +644,10 @@ sub provision_raw_prepare($$$$$$$$$$$$)
@{$ctx->{provision_options}} = @provision_options;
if (defined($extra_provision_options)) {
push (@{$ctx->{provision_options}}, @{$extra_provision_options});
}
return $ctx;
}
@ -1082,11 +1095,10 @@ sub provision($$$$$$$$$$)
$domain, $realm,
$samsid,
$functional_level,
$password, $kdc_ipv4, $kdc_ipv6);
if (defined($extra_provision_options)) {
push (@{$ctx->{provision_options}}, @{$extra_provision_options});
}
$password,
$kdc_ipv4,
$kdc_ipv6,
$extra_provision_options);
$ctx->{share} = "$ctx->{prefix_abs}/share";
push(@{$ctx->{directories}}, "$ctx->{share}");