s4

changeset 691:39879f81afc8

Login failure message changed
author HIROSE Yuuji <yuuji@gentei.org>
date Tue, 19 May 2020 09:10:34 +0900
parents 87ce0eef5872
children 9ff4603fc920
files s4-funcs.sh
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/s4-funcs.sh	Tue May 19 08:53:33 2020 +0900
     1.2 +++ b/s4-funcs.sh	Tue May 19 09:10:34 2020 +0900
     1.3 @@ -1284,11 +1284,13 @@
     1.4    pswd=`getpar pswd`
     1.5    quser=`sqlquotestr "$user"`
     1.6    dbuser=`query "SELECT name FROM user WHERE name=$quser;"`
     1.7 -  if [ -z "$dbuser" ]; then
     1.8 -    return 1
     1.9 +  if [ $? != 0 ]; then		# Maybe DB locked
    1.10 +    return 4			# 4=server too heavy
    1.11 +  elif [ -z "$dbuser" ]; then
    1.12 +    return 2			# 2=login fail
    1.13    elif [ x"$pswd" = x"wasureta" ]; then
    1.14      wasureta "$user"
    1.15 -    return 1		# wasureta error
    1.16 +    return 1			# wasureta error
    1.17    fi
    1.18   # dbpswd="`sq $db \"select pswd from passwd where name='$user'\"`"
    1.19    # putheader; echo; echo user=$user, db=$dbpswd, enc=$encpswd