From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 20 Jan 2002 22:06:35 +0000 (+0000)
Subject: A couple more little fixes for the domain security tests.
X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=ddc1b816d79c4928b2b92dbbcf80579a2a0e6943;hp=84b8eb8fed1d1d10a89500c1ada5597b7bf2450a

A couple more little fixes for the domain security tests.
(This used to be commit 409fb69ecbf1849b5c92ea018eaed126a4f8a24d)
---

diff --git a/testsuite/build_farm/basicsmb-domainsec-nt4.test b/testsuite/build_farm/basicsmb-domainsec-nt4.test
index 96fac42ab2f..62d4fb28755 100644
--- a/testsuite/build_farm/basicsmb-domainsec-nt4.test
+++ b/testsuite/build_farm/basicsmb-domainsec-nt4.test
@@ -8,9 +8,9 @@ test_joindomain_nt4() {
         $prefix/bin/net rpc join oldstyle -S localhost
 	status=$?
 	if [ $status = 0 ]; then
-	    echo "'net rpc join oldstyle' correctly joined the domain ($workgroup)"
+	    echo "'net rpc join oldstyle' correctly joined the domain"
 	else
-	    echo "'net rpc join oldstyle' failed to join the domain ($workgroup)! (status $status)"
+	    echo "'net rpc join oldstyle' failed to join the domain! (status $status)"
 	    return 1
 	fi
 	return 0
diff --git a/testsuite/build_farm/basicsmb-domainsec.test b/testsuite/build_farm/basicsmb-domainsec.test
index 20a7001c746..eb0a5c81aa1 100644
--- a/testsuite/build_farm/basicsmb-domainsec.test
+++ b/testsuite/build_farm/basicsmb-domainsec.test
@@ -2,15 +2,15 @@
 . basicsmb.fns
 
 test_joindomain() {
-	test_joindomain_password="$1"
+	test_join_domain_password="$1"
 
 	echo "$prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password"
 	$prefix/bin/net rpc join -S localhost  -U $whoami%$test_join_domain_password
 	status=$?
 	if [ $status = 0 ]; then
-	    echo "'net rpc join' correctly joined the domain ($workgroup)"
+	    echo "'net rpc join' correctly joined the domain"
 	else
-	    echo "'net rpc join' failed to join the domain ($workgroup)! (status $status)"
+	    echo "'net rpc join' failed to join the domain! (status $status)"
 	    return 1
 	fi
 	return 0