selftest: Pass force_fips to provision()
authorAndreas Schneider <asn@samba.org>
Fri, 13 Mar 2020 13:29:48 +0000 (14:29 +0100)
committerAndreas Schneider <asn@cryptomilk.org>
Wed, 8 Apr 2020 13:02:40 +0000 (13:02 +0000)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
selftest/target/Samba4.pm

index e3e88e21f5d9defa7232e4ea7c369dde93d7dea9..76495935b8f953e074e96a5291fd5fde0f970db9 100755 (executable)
@@ -1081,11 +1081,21 @@ userPrincipalName: jane.doe\@$ctx->{realm}
        return $ret;
 }
 
-sub provision($$$$$$$$$$)
+sub provision($$$$$$$$$$$)
 {
-       my ($self, $prefix, $server_role, $hostname,
-           $domain, $realm, $functional_level,
-           $password, $kdc_ipv4, $kdc_ipv6, $extra_smbconf_options, $extra_smbconf_shares,
+       my ($self,
+           $prefix,
+           $server_role,
+           $hostname,
+           $domain,
+           $realm,
+           $functional_level,
+           $password,
+           $kdc_ipv4,
+           $kdc_ipv6,
+           $force_fips_mode,
+           $extra_smbconf_options,
+           $extra_smbconf_shares,
            $extra_provision_options) = @_;
 
        my $samsid = Samba::random_domain_sid();
@@ -1269,6 +1279,7 @@ server min protocol = LANMAN1
                                   "locMEMpass3",
                                   $dcvars->{SERVER_IP},
                                   $dcvars->{SERVER_IPV6},
+                                  undef,
                                   $extra_smb_conf, "",
                                   $extra_provision_options);
        unless ($ret) {
@@ -1331,6 +1342,7 @@ sub provision_rpc_proxy($$$)
                                   "locRPCproxypass4",
                                   $dcvars->{SERVER_IP},
                                   $dcvars->{SERVER_IPV6},
+                                  undef,
                                   $extra_smbconf_options, "",
                                   $extra_provision_options);
        unless ($ret) {
@@ -1549,6 +1561,7 @@ sub provision_ad_dc_ntvfs($$$)
                                   "locDCpass1",
                                   undef,
                                   undef,
+                                  undef,
                                   $extra_conf_options,
                                   "",
                                   $extra_provision_options);
@@ -1590,6 +1603,7 @@ sub provision_fl2000dc($$)
                                   "locDCpass5",
                                   undef,
                                   undef,
+                                  undef,
                                   $extra_conf_options,
                                   "",
                                   $extra_provision_options);
@@ -1627,6 +1641,7 @@ sub provision_fl2003dc($$$)
                                   "locDCpass6",
                                   undef,
                                   undef,
+                                  undef,
                                   $extra_conf_options,
                                   "",
                                   $extra_provision_options);
@@ -1677,6 +1692,7 @@ sub provision_fl2008r2dc($$$)
                                   "locDCpass7",
                                   undef,
                                   undef,
+                                  undef,
                                   $extra_conf_options,
                                   "",
                                   $extra_provision_options);
@@ -1937,6 +1953,7 @@ sub provision_ad_dc($$$$$$$)
                                   "locDCpass1",
                                   undef,
                                   undef,
+                                  $force_fips_mode,
                                   $extra_smbconf_options,
                                   $extra_smbconf_shares,
                                   $extra_provision_options);
@@ -1975,6 +1992,7 @@ sub provision_chgdcpass($$)
                                   "chgDCpass1",
                                   undef,
                                   undef,
+                                  undef,
                                   $extra_smb_conf,
                                   "",
                                   $extra_provision_options);