selftest: Pass down the machine account name to provision_ad_member

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 5a7efa9c28039fc12b74cc022d400e756efc3e08..d48ac2c64a1a75034bf8de3f5f2d964878a533ad 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -588,6 +588,7 @@ sub get_interface($)
                addcsmb1          => 54,
                lclnt4dc2smb1     => 55,
                fipsdc            => 56,
+               fipsadmember      => 57,
 
                rootdnsforwarder  => 64,
 

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 495830e3359da390b5168b189f300b77fe2d9f72..8192f7c8613e44dee7db5ba6829785b916634bd7 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -646,6 +646,7 @@ sub provision_ad_member
 {
        my ($self,
            $prefix,
+           $machine_account,
            $dcvars,
            $trustvars_f,
            $trustvars_e,
@@ -758,7 +759,7 @@ sub provision_ad_member
            prefix => $prefix,
            domain => $dcvars->{DOMAIN},
            realm => $dcvars->{REALM},
-           server => "LOCALADMEMBER",
+           server => $machine_account,
            password => "loCalMemberPass",
            extra_options => $member_options,
            resolv_conf => $dcvars->{RESOLV_CONF});
@@ -873,7 +874,11 @@ sub setup_ad_member
 
        print "PROVISIONING AD MEMBER...";
 
-       return $self->provision_ad_member($prefix, $dcvars, $trustvars_f, $trustvars_e);
+       return $self->provision_ad_member($prefix,
+                                         "LOCALADMEMBER",
+                                         $dcvars,
+                                         $trustvars_f,
+                                         $trustvars_e);
 }
 
 sub setup_ad_member_rfc2307
@@ -1199,6 +1204,7 @@ sub setup_ad_member_fips
        print "PROVISIONING AD FIPS MEMBER...";
 
        return $self->provision_ad_member($prefix,
+                                         "FIPSADMEMBER",
                                          $dcvars,
                                          $trustvars_f,
                                          $trustvars_e,