selftest: Consistently check for provision return code

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index a79a917fdb8e89785a8c8aeb18dd3b640e9099fb..8ec87c51c223df1bcb934f75a4a97807d67f3e29 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1049,7 +1049,6 @@ sub provision_rpc_proxy($$$)
                                   $dcvars->{SERVER_IP},
                                   $dcvars->{SERVER_IPV6},
                                   $extra_smbconf_options, "", undef);
-
        unless ($ret) {
                return undef;
        }
@@ -1364,8 +1363,10 @@ sub provision_ad_dc_ntvfs($$)
                                   $extra_conf_options,
                                   "",
                                   undef);
+       unless ($ret) {
+               return undef;
+       }
 
-       return undef unless(defined $ret);
        unless($self->add_wins_config("$prefix/private")) {
                warn("Unable to add wins configuration");
                return undef;
@@ -1403,6 +1404,9 @@ sub provision_fl2000dc($$)
                                   $extra_conf_options,
                                   "",
                                   undef);
+       unless ($ret) {
+               return undef;
+       }
 
        unless($self->add_wins_config("$prefix/private")) {
                warn("Unable to add wins configuration");
@@ -1440,7 +1444,6 @@ sub provision_fl2003dc($$$)
                                   $extra_conf_options,
                                   "",
                                   undef);
-
        unless (defined $ret) {
                return undef;
        }
@@ -1496,6 +1499,9 @@ sub provision_fl2008r2dc($$$)
                                   $extra_conf_options,
                                   "",
                                   undef);
+       unless (defined $ret) {
+               return undef;
+       }
 
        unless ($self->add_wins_config("$prefix/private")) {
                warn("Unable to add wins configuration");
@@ -1720,8 +1726,10 @@ sub provision_ad_dc($$)
                                   $extra_smbconf_options,
                                   $extra_smbconf_shares,
                                   undef);
+       unless (defined $ret) {
+               return undef;
+       }
 
-       return undef unless(defined $ret);
        unless($self->add_wins_config("$prefix/private")) {
                warn("Unable to add wins configuration");
                return undef;
@@ -1756,8 +1764,10 @@ sub provision_chgdcpass($$)
                                   "",
                                   "",
                                   $extra_provision_options);
+       unless (defined $ret) {
+               return undef;
+       }
 
-       return undef unless(defined $ret);
        unless($self->add_wins_config("$prefix/private")) {
                warn("Unable to add wins configuration");
                return undef;