mirror of
https://github.com/samba-team/samba.git
synced 2025-03-27 22:50:26 +03:00
selftest: do early exit in setup_fl2008r2dc() if provision_fl2008r2dc() fails
No change in behaviour. 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:
parent
d0cdc81aa9
commit
5420af6942
@ -2575,22 +2575,22 @@ sub setup_fl2008r2dc
|
||||
|
||||
my $env = $self->provision_fl2008r2dc($path);
|
||||
|
||||
if (defined $env) {
|
||||
if (not defined($self->check_or_start($env, "standard"))) {
|
||||
return undef;
|
||||
}
|
||||
|
||||
my $upn_array = ["$env->{REALM}.upn"];
|
||||
my $spn_array = ["$env->{REALM}.spn"];
|
||||
|
||||
if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) {
|
||||
return undef;
|
||||
}
|
||||
|
||||
$env = $self->setup_trust($env, $dc_vars, "forest", "");
|
||||
if (!defined $env) {
|
||||
return $env;
|
||||
}
|
||||
|
||||
return $env;
|
||||
if (not defined($self->check_or_start($env, "standard"))) {
|
||||
return undef;
|
||||
}
|
||||
|
||||
my $upn_array = ["$env->{REALM}.upn"];
|
||||
my $spn_array = ["$env->{REALM}.spn"];
|
||||
|
||||
if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) {
|
||||
return undef;
|
||||
}
|
||||
|
||||
return $self->setup_trust($env, $dc_vars, "forest", "");
|
||||
}
|
||||
|
||||
sub setup_vampire_dc
|
||||
|
Loading…
x
Reference in New Issue
Block a user