use the variable passed as a paramater, not just one randomly in our namespace.

[jra/samba/.git] / testsuite / build_farm / basicsmb.fns

diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
index ab866601a34519e7fc956f4a0e3c26c6c0c84b99..135a17fe934cfbdff73177a989a07ab139da6225 100644 (file)
--- a/testsuite/build_farm/basicsmb.fns
+++ b/testsuite/build_farm/basicsmb.fns
@@ -75,7 +75,7 @@ test_smbpasswd() {
        test_smbpasswd_password="$1"
        rm -f $prefix/private/smbpasswd
        echo "( echo $test_smbpasswd_password ; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -s -a $whoami"
-       ( echo $password ; echo $password; ) | $prefix/bin/smbpasswd -L -s -a $whoami
+       ( echo $test_smbpasswd_password; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -s -a $whoami
        status=$?
        if [ $status = 0 ]; then
            echo "smbpasswd correctly set initial password ($test_smbpasswd_password)"
@@ -87,16 +87,15 @@ test_smbpasswd() {
 }
 
 test_smbpasswd_remote() {
-       test_smbpasswd_password="$1"
-       test_smbpasswd_newpassword="$2"
-       rm -f $prefix/private/smbpasswd
-       echo "( echo $test_smbpasswd_password; echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -r localhost -s -U $whoami"
-       ( echo $test_smbpasswd_password; echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -r localhost -s -U $whoami
+       test_smbpasswd_rem_password="$1"
+       test_smbpasswd_rem_newpassword="$2"
+       echo "( echo $test_smbpasswd_rem_password; echo $test_smbpasswd_rem_newpassword; echo $test_smbpasswd_rem_newpassword; ) | $prefix/bin/smbpasswd -r localhost -s -U $whoami"
+       ( echo $test_smbpasswd_rem_password; echo $test_smbpasswd_rem_newpassword; echo $test_smbpasswd_rem_newpassword; ) | $prefix/bin/smbpasswd -r localhost -s -U $whoami
        status=$?
        if [ $status = 0 ]; then
-           echo "smbpasswd correctly remotely changed password ($test_smbpasswd_password -> $test_smbpasswd_newpassword)"
+           echo "smbpasswd correctly remotely changed password ($test_smbpasswd_rem_password -> $test_smbpasswd_rem_newpassword)"
        else
-           echo "smbpasswd failed to remotely changed password ($test_smbpasswd_password -> $test_smbpasswd_newpassword)! (status $status)"
+           echo "smbpasswd failed to remotely changed password ($test_smbpasswd_rem_password -> $test_smbpasswd_rem_newpassword)! (status $status)"
            return 1
        fi
        return 0
@@ -104,9 +103,8 @@ test_smbpasswd_remote() {
 
 test_smbpasswd_local() {
        test_smbpasswd_newpassword="$2"
-       rm -f $prefix/private/smbpasswd
-       echo "( echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -L $whoami"
-       ( echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -L $whoami
+       echo "( echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -L -s $whoami"
+       ( echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -L -s $whoami
        status=$?
        if [ $status = 0 ]; then
            echo "smbpasswd correctly locally changed password ($test_smbpasswd_password -> $test_smbpasswd_newpassword)"