diff options
| author | Andreas Schneider <asn@samba.org> | 2016-06-17 09:23:49 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2016-06-17 18:15:22 +0200 |
| commit | 1619cde477e0b6e1fae035f63681bce4805e4390 (patch) | |
| tree | 46fa72b5d246c5a6fc929c12e597938f20cf5a04 /selftest | |
| parent | f6e4dc2a92fc6b9ba5c4cc329f37bba27acd2290 (diff) | |
| download | samba-1619cde477e0b6e1fae035f63681bce4805e4390.tar.gz | |
selftest: Consistently check for provision return code
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/target/Samba4.pm | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index a79a917fdb8..8ec87c51c22 100755 --- 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; |