From 08be28241b808845c4b51a4c47765a9416ca3aa7 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 8 Apr 2021 15:54:18 +0200
Subject: selftest: Check the return code of setup_namespaces()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---
 selftest/target/Samba4.pm | 52 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 14 deletions(-)

(limited to 'selftest')

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;
 }
-- 
cgit v1.2.1