selftest: Improve connection between primary domain and subdomain for krb5

[nivanova/samba-autobuild/.git] / selftest / target / Samba4.pm

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 791e12fe5622c5d4b1716b4e9cfadbdcf33ff4b7..28c287ed19cb9b6e7949b1cf3798aa888614a60d 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1262,15 +1262,23 @@ sub provision_subdom_dc($$$)
                return undef;
        }
 
+        # This ensures we share the krb5.conf with the main DC, so
+        # they can find each other.  Sadly only works between 'dc' and
+        # 'subdom_dc', the other DCs won't see it
+
         my $dc_realms = Samba::mk_realms_stanza($dcvars->{REALM}, lc($dcvars->{REALM}),
                                                 $dcvars->{DOMAIN}, $dcvars->{SERVER_IP});
+
+        $ret->{KRB5_CONFIG} = $dcvars->{KRB5_CONFIG};
+        $ctx->{krb5_conf} = $dcvars->{KRB5_CONFIG};
+
        Samba::mk_krb5_conf($ctx, $dc_realms);
 
        my $samba_tool =  Samba::bindir_path($self, "samba-tool");
        my $cmd = "";
        $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
        $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
-       $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $ctx->{realm} subdomain ";
+       $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $ctx->{dnsname} subdomain ";
        $cmd .= "--parent-domain=$dcvars->{REALM} -U$dcvars->{DC_USERNAME}\@$dcvars->{REALM}\%$dcvars->{DC_PASSWORD}";
        $cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs";
        $cmd .= " --adminpass=$ret->{PASSWORD}";