selftest:Samba3: let setup_ad_member_s3_join use a fixed DC

The vampire_dc environment has 2 DCs and we should make sure
we use a predictable DC (vampire_dc) in order to have stable
test results.

Pair-Programmed-With: Volker Lendecke <vl@samba.org>

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Volker Lendecke <vl@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index b4e7f1a017d258d4ef5b74d966ac66e2f60da4a4..733c1bab75029eaac05ed8701ef43caf6900c92f 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -741,7 +741,8 @@ sub provision_ad_member
            $force_fips_mode,
            $offline_logon,
            $no_nss_winbind,
-           $sync_pw2keytab) = @_;
+           $sync_pw2keytab,
+           $join_args) = @_;
 
        if (defined($offline_logon) && defined($no_nss_winbind)) {
                warn ("Offline logon incompatible with no nss winbind\n");
@@ -943,6 +944,9 @@ sub provision_ad_member
        $cmd .= "SELFTEST_WINBINDD_SOCKET_DIR=\"$ret->{SELFTEST_WINBINDD_SOCKET_DIR}\" ";
        $cmd .= "$net join $ret->{CONFIGURATION}";
        $cmd .= " -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD} --use-kerberos=required";
+       if (defined($join_args)) {
+               $cmd .= ${join_args};
+       }
 
        if (system($cmd) != 0) {
            warn("Join failed\n$cmd");
@@ -1126,13 +1130,21 @@ sub setup_ad_member_s3_join
                 return "UNKNOWN";
         }
 
-        print "PROVISIONING AD MEMBER...";
+        print "PROVISIONING AD MEMBER S3 JOIN...";
+
+        my $join_args = " --server=$dcvars->{SERVER}.$dcvars->{REALM}";
 
         return $self->provision_ad_member($prefix,
                                           "LOCALADMEMBER2",
                                           $dcvars,
                                           $trustvars_f,
-                                          $trustvars_e);
+                                          $trustvars_e,
+                                          undef, # extra_member_options
+                                          undef, # force_fips_mode
+                                          undef, # offline_logon
+                                          undef, # no_nss_winbind
+                                          undef, # sync_pw2keytab
+                                          ${join_args});
 }
 
 sub setup_ad_member_rfc2307