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 96fac42ab2f62874f6af53882f619406609f65bc..62d4fb2875573b7137a16ac8a4033d5fb6ed0c3f 100644 (file)
--- 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 20a7001c746f9ddafe91b4498a6e09a97d3ae0cc..eb0a5c81aa1a180147e0fe012b0d146e731cb1f7 100644 (file)
--- 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