summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-01-20 22:06:35 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-01-20 22:06:35 +0000
commitddc1b816d79c4928b2b92dbbcf80579a2a0e6943 (patch)
treebe50fc1a6ffa4b039a2f3b8744b9ac43e84a7f0d
parent84b8eb8fed1d1d10a89500c1ada5597b7bf2450a (diff)
downloadsamba-ddc1b816d79c4928b2b92dbbcf80579a2a0e6943.tar.gz
samba-ddc1b816d79c4928b2b92dbbcf80579a2a0e6943.tar.bz2
samba-ddc1b816d79c4928b2b92dbbcf80579a2a0e6943.zip
A couple more little fixes for the domain security tests.
(This used to be commit 409fb69ecbf1849b5c92ea018eaed126a4f8a24d)
-rw-r--r--testsuite/build_farm/basicsmb-domainsec-nt4.test4
-rw-r--r--testsuite/build_farm/basicsmb-domainsec.test6
2 files changed, 5 insertions, 5 deletions
diff --git a/testsuite/build_farm/basicsmb-domainsec-nt4.test b/testsuite/build_farm/basicsmb-domainsec-nt4.test
index 96fac42ab2..62d4fb2875 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 20a7001c74..eb0a5c81aa 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