diff options
| author | Andreas Schneider <asn@samba.org> | 2021-04-08 15:54:18 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2021-04-28 03:43:34 +0000 |
| commit | 08be28241b808845c4b51a4c47765a9416ca3aa7 (patch) | |
| tree | 0685cb9211abc495206792ea32d61d133f854939 /selftest | |
| parent | 1cd233712e1a62d716a1d8b34ff3dca6a8f0f501 (diff) | |
| download | samba-08be28241b808845c4b51a4c47765a9416ca3aa7.tar.gz | |
selftest: Check the return code of setup_namespaces()
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 | 52 |
1 files changed, 38 insertions, 14 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 5c9bbe0da20..33f53fe68e2 100755 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -456,10 +456,10 @@ sub setup_namespaces $namespaces .= $cmd_config; unless (system($namespaces) == 0) { warn("Failed to add namespaces \n$namespaces"); - return; + return -1; } - return; + return 0; } sub setup_trust($$$$$) @@ -2410,7 +2410,9 @@ sub setup_fl2008r2dc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } $env = $self->setup_trust($env, $dc_vars, "forest", ""); } @@ -2595,7 +2597,9 @@ sub _setup_ad_dc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -2653,7 +2657,9 @@ sub setup_ad_dc_no_nss my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -2685,7 +2691,9 @@ sub setup_ad_dc_no_ntlm my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -2717,7 +2725,9 @@ sub setup_ad_dc_fips my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -2762,7 +2772,9 @@ sub setup_preforkrestartdc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -2801,7 +2813,9 @@ sub setup_proclimitdc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -2832,7 +2846,9 @@ sub setup_schema_dc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -2929,7 +2945,9 @@ sub setup_backupfromdc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } # Set up a dangling forward link to an expunged object # @@ -3225,7 +3243,9 @@ sub setup_renamedc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -3344,7 +3364,9 @@ sub setup_labdc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } @@ -3464,7 +3486,9 @@ sub setup_customdc my $upn_array = ["$env->{REALM}.upn"]; my $spn_array = ["$env->{REALM}.spn"]; - $self->setup_namespaces($env, $upn_array, $spn_array); + if ($self->setup_namespaces($env, $upn_array, $spn_array) != 0) { + return undef; + } return $env; } |