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>

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index dd1400633e83ed15d129cc2e0f701c4b1fc2dc36..e66746c042efec35e5805cfd9fc8e8a4aba5986a 100755 (executable)
--- 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;
-               }
+       if (!defined $env) {
+           return $env;
+       }
 
-               my $upn_array = ["$env->{REALM}.upn"];
-               my $spn_array = ["$env->{REALM}.spn"];
+       if (not defined($self->check_or_start($env, "standard"))) {
+           return undef;
+       }
 
-               if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) {
-                       return undef;
-               }
+       my $upn_array = ["$env->{REALM}.upn"];
+       my $spn_array = ["$env->{REALM}.spn"];
 
-               $env = $self->setup_trust($env, $dc_vars, "forest", "");
+       if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) {
+           return undef;
        }
 
-       return $env;
+       return $self->setup_trust($env, $dc_vars, "forest", "");
 }
 
 sub setup_vampire_dc