From 5420af6942307e045be1317edc323ee3ff9f379b Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 11 Jan 2024 12:02:43 +0100 Subject: [PATCH] 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 Reviewed-by: Stefan Metzmacher --- selftest/target/Samba4.pm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index dd1400633e8..e66746c042e 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -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