diff options
| -rwxr-xr-x | source3/script/tests/test_net_rpc_oldjoin.sh | 23 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_password_settings.sh | 35 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_pdbtest.sh | 37 |
3 files changed, 78 insertions, 17 deletions
diff --git a/source3/script/tests/test_net_rpc_oldjoin.sh b/source3/script/tests/test_net_rpc_oldjoin.sh index 070fcc1add7..97586874be9 100755 --- a/source3/script/tests/test_net_rpc_oldjoin.sh +++ b/source3/script/tests/test_net_rpc_oldjoin.sh @@ -22,8 +22,29 @@ export UID_WRAPPER_ROOT OPTIONS="--configfile $SMB_CONF_PATH --option=netbiosname=$maccount --option=security=domain --option=domainlogons=no --option=privatedir=$privatedir" +test_smbpasswd() +{ + account=$1 + + echo "set password with smbpasswd" + + cmd='UID_WRAPPER_INITIAL_RUID=0 UID_WRAPPER_INITIAL_EUID=0 $VALGRIND $BINDIR/smbpasswd -L -c $SMB_CONF_PATH -a -m "$account"' + eval echo "$cmd" + out=$(eval $cmd) + ret=$? + rm -f $tmpfile + + if [ $ret -ne 0 ]; then + echo "Failed to change user password $user" + return 1 + fi +} + + testit "mkdir -p $privatedir" mkdir -p $privatedir || failed=`expr $failed + 1` -testit "smbpasswd -a -m" $VALGRIND $BINDIR/smbpasswd -L -c $SMB_CONF_PATH -a -m "$maccount" || failed=`expr $failed + 1` +testit "smbpasswd -a -m" \ + test_smbpasswd $maccount \ + || failed=$(expr $failed + 1) testit "net_rpc_oldjoin" $VALGRIND $BINDIR/net rpc oldjoin -S $SERVER $OPTIONS || failed=`expr $failed + 1` testit "net_rpc_testjoin1" $VALGRIND $BINDIR/net rpc testjoin -S $SERVER $OPTIONS || failed=`expr $failed + 1` testit "net_rpc_changetrustpw" $VALGRIND $BINDIR/net rpc changetrustpw -S $SERVER $OPTIONS || failed=`expr $failed + 1` diff --git a/testprogs/blackbox/test_password_settings.sh b/testprogs/blackbox/test_password_settings.sh index 93e03770ed2..600bf0d0751 100755 --- a/testprogs/blackbox/test_password_settings.sh +++ b/testprogs/blackbox/test_password_settings.sh @@ -52,6 +52,31 @@ do_kinit() { fi } +test_smbpasswd() +{ + user=$1 + newpass=$2 + + tmpfile=$PREFIX/smbpasswd_change_password_script + cat > $tmpfile <<EOF +expect New SMB password: +send ${newpass}\n +expect Retype new SMB password: +send ${newpass}\n +EOF + + cmd='UID_WRAPPER_INITIAL_RUID=0 UID_WRAPPER_INITIAL_EUID=0 $texpect $tmpfile $smbpasswd -L -c $PREFIX/etc/smb.conf $user' + eval echo "$cmd" + out=$(eval $cmd) + ret=$? + rm -f $tmpfile + + if [ $ret -ne 0 ]; then + echo "Failed to change user password $user" + return 1 + fi +} + UID_WRAPPER_ROOT=1 export UID_WRAPPER_ROOT @@ -139,15 +164,9 @@ rm -f $KRB5CCNAME_PATH ### Set the password with smbpasswd ########################################################### -cat > $PREFIX/tmpsmbpasswdscript <<EOF -expect New SMB password: -send ${TEST_PASSWORD_NEW}\n -expect Retype new SMB password: -send ${TEST_PASSWORD_NEW}\n -EOF - testit "set user password with smbpasswd" \ - $texpect $PREFIX/tmpsmbpasswdscript $smbpasswd -L -c $PREFIX/etc/smb.conf $TEST_USERNAME || failed=`expr $failed + 1` + test_smbpasswd $TEST_USERNAME $TEST_PASSWORD_NEW \ + || failed=$(expr $failed + 1) TEST_PASSWORD=$TEST_PASSWORD_NEW TEST_PASSWORD_NEW="testPaSS@03%" diff --git a/testprogs/blackbox/test_pdbtest.sh b/testprogs/blackbox/test_pdbtest.sh index 02615094451..d5c37f0acc9 100755 --- a/testprogs/blackbox/test_pdbtest.sh +++ b/testprogs/blackbox/test_pdbtest.sh @@ -32,6 +32,32 @@ unc="//$SERVER/tmp" UID_WRAPPER_ROOT=1 export UID_WRAPPER_ROOT +test_smbpasswd() +{ + user=$1 + newpass=$2 + + echo "set password with smbpasswd" + tmpfile=$PREFIX/smbpasswd_change_password_script + cat > $tmpfile <<EOF +expect New SMB password: +send ${newpass}\n +expect Retype new SMB password: +send ${newpass}\n +EOF + + cmd='UID_WRAPPER_INITIAL_RUID=0 UID_WRAPPER_INITIAL_EUID=0 $texpect $tmpfile $smbpasswd -L $user -c $SMB_CONF' + eval echo "$cmd" + out=$(eval $cmd) + ret=$? + rm -f $tmpfile + + if [ $ret -ne 0 ]; then + echo "Failed to change user password $user" + return 1 + fi +} + testit "pdbtest" $VALGRIND $BINDIR/pdbtest -u $USER $@ || failed=`expr $failed + 1` NEWUSERPASS=testPaSS@01% @@ -55,15 +81,10 @@ test_smbclient "Test login with user (ntlm)" 'ls' "$unc" -k no -U$USER%$NEWUSERP NEWUSERPASS=testPaSS@02% -echo "set password with smbpasswd" -cat > ./tmpsmbpasswdscript <<EOF -expect New SMB password: -send ${NEWUSERPASS}\n -expect Retype new SMB password: -send ${NEWUSERPASS}\n -EOF +testit "set user password with smbpasswd" \ + test_smbpasswd $USER $NEWUSERPASS \ + || failed=$(expr $failed + 1) -testit "set user password with smbpasswd" $texpect ./tmpsmbpasswdscript $smbpasswd -L $USER -c $SMB_CONF || failed=`expr $failed + 1` USERPASS=$NEWUSERPASS test_smbclient "Test login with user (ntlm)" 'ls' "$unc" -k no -U$USER%$NEWUSERPASS $@|| failed=`expr $failed + 1` |