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 46e2d861929f0b69c31aa127f9ccac753f25fd11..c67bac32ffd24fb0a1d23828d8185111d2633447 100755 (executable)
--- 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}");