selftest: Export TRUST information in the ad_member target environment

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14124

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

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

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 996bdae188aa9dabae70aff9b38a4a360e7b83ea..d933faba1d5a45650c44a47e0002fd4c60dd0418 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -724,6 +724,28 @@ my @exported_envvars = (
        "TRUST_REALM",
        "TRUST_DOMSID",
 
+       # stuff related to a trusted domain, on a trust_member
+       # the domain behind a forest trust (two-way)
+       "TRUST_F_BOTH_SERVER",
+       "TRUST_F_BOTH_SERVER_IP",
+       "TRUST_F_BOTH_SERVER_IPV6",
+       "TRUST_F_BOTH_NETBIOSNAME",
+       "TRUST_F_BOTH_USERNAME",
+       "TRUST_F_BOTH_PASSWORD",
+       "TRUST_F_BOTH_DOMAIN",
+       "TRUST_F_BOTH_REALM",
+
+       # stuff related to a trusted domain, on a trust_member
+       # the domain behind an external trust (two-way)
+       "TRUST_E_BOTH_SERVER",
+       "TRUST_E_BOTH_SERVER_IP",
+       "TRUST_E_BOTH_SERVER_IPV6",
+       "TRUST_E_BOTH_NETBIOSNAME",
+       "TRUST_E_BOTH_USERNAME",
+       "TRUST_E_BOTH_PASSWORD",
+       "TRUST_E_BOTH_DOMAIN",
+       "TRUST_E_BOTH_REALM",
+
        # domain controller stuff
        "DC_SERVER",
        "DC_SERVER_IP",

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 7c9fdfc6889c613f7042f4d0ac49c34d0cfc6f1d..69a350d3d086fd7367a76474152bad38c15829bc 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"],
+       ad_member           => ["ad_dc", "fl2008r2dc", "fl2003dc"],
        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) = @_;
+       my ($self, $prefix, $dcvars, $trustvars_f, $trustvars_e) = @_;
 
        my $prefix_abs = abs_path($prefix);
        my @dirs = ();
@@ -493,6 +493,26 @@ sub setup_ad_member
        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
 
+       # forest trust
+       $ret->{TRUST_F_BOTH_SERVER} = $trustvars_f->{SERVER};
+       $ret->{TRUST_F_BOTH_SERVER_IP} = $trustvars_f->{SERVER_IP};
+       $ret->{TRUST_F_BOTH_SERVER_IPV6} = $trustvars_f->{SERVER_IPV6};
+       $ret->{TRUST_F_BOTH_NETBIOSNAME} = $trustvars_f->{NETBIOSNAME};
+       $ret->{TRUST_F_BOTH_USERNAME} = $trustvars_f->{USERNAME};
+       $ret->{TRUST_F_BOTH_PASSWORD} = $trustvars_f->{PASSWORD};
+       $ret->{TRUST_F_BOTH_DOMAIN} = $trustvars_f->{DOMAIN};
+       $ret->{TRUST_F_BOTH_REALM} = $trustvars_f->{REALM};
+
+       # external trust
+       $ret->{TRUST_E_BOTH_SERVER} = $trustvars_e->{SERVER};
+       $ret->{TRUST_E_BOTH_SERVER_IP} = $trustvars_e->{SERVER_IP};
+       $ret->{TRUST_E_BOTH_SERVER_IPV6} = $trustvars_e->{SERVER_IPV6};
+       $ret->{TRUST_E_BOTH_NETBIOSNAME} = $trustvars_e->{NETBIOSNAME};
+       $ret->{TRUST_E_BOTH_USERNAME} = $trustvars_e->{USERNAME};
+       $ret->{TRUST_E_BOTH_PASSWORD} = $trustvars_e->{PASSWORD};
+       $ret->{TRUST_E_BOTH_DOMAIN} = $trustvars_e->{DOMAIN};
+       $ret->{TRUST_E_BOTH_REALM} = $trustvars_e->{REALM};
+
        return $ret;
 }