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 wrap: on
line diff
--- 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

yatex.org