TODO fl2000dc selftest: Export TRUST information in the ad_member target environment

Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Andreas Schneider <asn@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index d933faba1d5a45650c44a47e0002fd4c60dd0418..802c7b3d8eee3fbe6f14740e4dac877c50763a28 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -746,6 +746,17 @@ my @exported_envvars = (
        "TRUST_E_BOTH_DOMAIN",
        "TRUST_E_BOTH_REALM",
 
+       # stuff related to a trusted domain, on a trust_member
+       # the domain behind an external trust (one-way outgoing)
+       "TRUST_E_OUT_SERVER",
+       "TRUST_E_OUT_SERVER_IP",
+       "TRUST_E_OUT_SERVER_IPV6",
+       "TRUST_E_OUT_NETBIOSNAME",
+       "TRUST_E_OUT_USERNAME",
+       "TRUST_E_OUT_PASSWORD",
+       "TRUST_E_OUT_DOMAIN",
+       "TRUST_E_OUT_REALM",
+
        # domain controller stuff
        "DC_SERVER",
        "DC_SERVER_IP",

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index fab8bdda86e88c984bd55a1fc1aba72cb4fde164..ec29a12eaba9975d2317e0ccd41d3fa4fccc9c74 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -181,7 +181,7 @@ sub check_env($$)
 
        nt4_member          => ["nt4_dc"],
 
-       ad_member           => ["ad_dc", "fl2008r2dc", "fl2003dc"],
+       ad_member           => ["ad_dc", "fl2008r2dc", "fl2003dc", "fl2000dc"],
        ad_member_rfc2307   => ["ad_dc_ntvfs"],
        ad_member_idmap_rid => ["ad_dc"],
        ad_member_idmap_ad  => ["fl2008r2dc"],
@@ -369,7 +369,7 @@ sub setup_nt4_member
 
 sub setup_ad_member
 {
-       my ($self, $prefix, $dcvars, $trustvars_f, $trustvars_e) = @_;
+       my ($self, $prefix, $dcvars, $trustvars_f, $trustvars_e, $trustvars_o) = @_;
 
        my $prefix_abs = abs_path($prefix);
        my @dirs = ();
@@ -515,6 +515,16 @@ sub setup_ad_member
        $ret->{TRUST_E_BOTH_DOMAIN} = $trustvars_e->{DOMAIN};
        $ret->{TRUST_E_BOTH_REALM} = $trustvars_e->{REALM};
 
+       # external trust, one-way outgoing
+       $ret->{TRUST_E_OUT_SERVER} = $trustvars_o->{SERVER};
+       $ret->{TRUST_E_OUT_SERVER_IP} = $trustvars_o->{SERVER_IP};
+       $ret->{TRUST_E_OUT_SERVER_IPV6} = $trustvars_o->{SERVER_IPV6};
+       $ret->{TRUST_E_OUT_NETBIOSNAME} = $trustvars_o->{NETBIOSNAME};
+       $ret->{TRUST_E_OUT_USERNAME} = $trustvars_o->{USERNAME};
+       $ret->{TRUST_E_OUT_PASSWORD} = $trustvars_o->{PASSWORD};
+       $ret->{TRUST_E_OUT_DOMAIN} = $trustvars_o->{DOMAIN};
+       $ret->{TRUST_E_OUT_REALM} = $trustvars_o->{REALM};
+
        return $ret;
 }