sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

selftest: create trust between fl2008r2dc and nt4_dc

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15533

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Ralph Boehme 2024-01-13 08:48:54 +01:00 committed by Stefan Metzmacher
parent 9725aa932e
commit 645a725603
2 changed files with 61 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
selftest/target/Samba.pm
View File

@ -921,6 +921,13 @@ my @exported_envvars = (
"TRUST_E_BOTH_DOMAIN",
"TRUST_E_BOTH_REALM",
# stuff related to a trusted NT4 domain,
# used for one-way trust fl2008r2dc <- nt4_dc
"NT4_TRUST_SERVER",
"NT4_TRUST_SERVER_IP",
"NT4_TRUST_DOMAIN",
"NT4_TRUST_DOMSID",
# domain controller stuff
"DC_SERVER",
"DC_SERVER_IP",

57
selftest/target/Samba4.pm
View File

@ -2376,7 +2376,7 @@ sub check_env($$)
ad_dc_no_nss => ["dns_hub"],
ad_dc_no_ntlm => ["dns_hub"],
fl2008r2dc => ["ad_dc"],
fl2008r2dc => ["ad_dc", "nt4_dc"],
fl2003dc => ["ad_dc"],
fl2000dc => ["ad_dc"],
@ -2571,7 +2571,7 @@ sub setup_fl2003dc
sub setup_fl2008r2dc
{
my ($self, $path, $ad_dc_vars) = @_;
my ($self, $path, $ad_dc_vars, $nt4_dc_vars) = @_;
my $env = $self->provision_fl2008r2dc($path);
@ -2590,7 +2590,58 @@ sub setup_fl2008r2dc
return undef;
}
return $self->setup_trust($env, $ad_dc_vars, "forest", "");
$env = $self->setup_trust($env, $ad_dc_vars, "forest", "");
if (!defined $env) {
return undef;
}
my $net = Samba::bindir_path($self, "net");
my $smbcontrol = Samba::bindir_path($self, "smbcontrol");
my $trustpw = "TrUsTpW";
$trustpw .= "$env->{SOCKET_WRAPPER_DEFAULT_IFACE}";
$trustpw .= "$nt4_dc_vars->{SOCKET_WRAPPER_DEFAULT_IFACE}";
my $cmd = "";
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
$cmd .= "SELFTEST_WINBINDD_SOCKET_DIR=\"$env->{SELFTEST_WINBINDD_SOCKET_DIR}\" ";
$cmd .= "$net rpc trust create ";
$cmd .= "otherdomainsid=$nt4_dc_vars->{SAMSID} ";
$cmd .= "otherdomain=$nt4_dc_vars->{DOMAIN} ";
$cmd .= "other_netbios_domain=$nt4_dc_vars->{DOMAIN} ";
$cmd .= "trustpw=$trustpw ";
$cmd .= "$env->{CONFIGURATION} ";
$cmd .= "-U $env->{DOMAIN}/$env->{USERNAME}\%$env->{PASSWORD} ";
if (system($cmd) != 0) {
warn("net rpc trust create failed\n$cmd");
return undef;
}
$cmd = "";
$cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$nt4_dc_vars->{SOCKET_WRAPPER_DEFAULT_IFACE}\" ";
$cmd .= "SELFTEST_WINBINDD_SOCKET_DIR=\"$nt4_dc_vars->{SELFTEST_WINBINDD_SOCKET_DIR}\" ";
$cmd .= "$net rpc trustdom establish $env->{DOMAIN} -U/%$trustpw $nt4_dc_vars->{CONFIGURATION}";
if (system($cmd) != 0) {
warn("add failed\n$cmd");
return undef;
}
# Reload trusts
$cmd = "$smbcontrol winbindd reload-config $nt4_dc_vars->{CONFIGURATION}";
if (system($cmd) != 0) {
warn("add failed\n$cmd");
return undef;
}
$env->{NT4_TRUST_SERVER} = $nt4_dc_vars->{SERVER};
$env->{NT4_TRUST_SERVER_IP} = $nt4_dc_vars->{SERVER_IP};
$env->{NT4_TRUST_DOMAIN} = $nt4_dc_vars->{DOMAIN};
$env->{NT4_TRUST_DOMSID} = $nt4_dc_vars->{DOMSID};
return $env;
}
sub setup_vampire_dc