From: Andreas Schneider <asn@samba.org>
Date: Fri, 13 Mar 2020 12:58:57 +0000 (+0100)
Subject: selftest: Pass extra_provision_options to provision_raw_prepare()
X-Git-Tag: ldb-2.2.0~967
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c5da549f6dbf4efec7f545459fba97ca89d72ad;p=thirdparty%2Fsamba.git

selftest: Pass extra_provision_options to provision_raw_prepare()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
---

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 46e2d861929..c67bac32ffd 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -471,11 +471,20 @@ sub setup_trust($$$$$)
 	return $localenv
 }
 
-sub provision_raw_prepare($$$$$$$$$$$$)
-{
-	my ($self, $prefix, $server_role, $hostname,
-	    $domain, $realm, $samsid, $functional_level,
-	    $password, $kdc_ipv4, $kdc_ipv6) = @_;
+sub provision_raw_prepare($$$$$$$$$$$$$)
+{
+	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}");