# HG changeset patch # User HIROSE Yuuji # Date 1589847034 -32400 # Node ID 39879f81afc8ff48244da5648e52be5ce9d5cf3c # Parent 87ce0eef5872d6ca81953b3ca692ae1696ac68ef Login failure message changed diff -r 87ce0eef5872 -r 39879f81afc8 s4-funcs.sh --- a/s4-funcs.sh Tue May 19 08:53:33 2020 +0900 +++ b/s4-funcs.sh Tue May 19 09:10:34 2020 +0900 @@ -1284,11 +1284,13 @@ pswd=`getpar pswd` quser=`sqlquotestr "$user"` dbuser=`query "SELECT name FROM user WHERE name=$quser;"` - if [ -z "$dbuser" ]; then - return 1 + if [ $? != 0 ]; then # Maybe DB locked + return 4 # 4=server too heavy + elif [ -z "$dbuser" ]; then + return 2 # 2=login fail elif [ x"$pswd" = x"wasureta" ]; then wasureta "$user" - return 1 # wasureta error + return 1 # wasureta error fi # dbpswd="`sq $db \"select pswd from passwd where name='$user'\"`" # putheader; echo; echo user=$user, db=$dbpswd, enc=$encpswd