From: Andreas Schneider <asn@samba.org>
Date: Fri, 13 Mar 2020 13:29:48 +0000 (+0100)
Subject: selftest: Pass force_fips to provision()
X-Git-Tag: ldb-2.2.0~965
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcd99c8d9f4a27e0e9575e0a590563f0b21c6dc8;p=thirdparty%2Fsamba.git

selftest: Pass force_fips to provision()

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 e3e88e21f5d..76495935b8f 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -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);