CVE-2020-25717 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>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14556

(cherry picked from commit fbe68dcbb783409589cdefd8ee551c9971c51f08)

Needed as preparation for CVE-2020-25717

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index d47f933376ef4891087131dad82f7cbf2afb1b8e..1e3b321258fbda08c442db327204f905dfbf8389 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -578,6 +578,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 8de5fe6a374aa37044c9cb0c5824fd95d40b0e73..6abec28d86287bca744ca9d4400702c02c17fb44 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -648,6 +648,7 @@ sub provision_ad_member
 {
        my ($self,
            $prefix,
+           $machine_account,
            $dcvars,
            $trustvars_f,
            $trustvars_e,
@@ -724,7 +725,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});
@@ -838,7 +839,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
@@ -1159,6 +1164,7 @@ sub setup_ad_member_fips
        print "PROVISIONING AD FIPS MEMBER...";
 
        return $self->provision_ad_member($prefix,
+                                         "FIPSADMEMBER",
                                          $dcvars,
                                          $trustvars_f,
                                          $trustvars_e,