changeset 298:ec267a1d27ee

Do not "wasureta" for nonexistent user
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 29 Sep 2016 14:47:29 +0859
parents 8933d3701c00
children b38514180d13
files s4-funcs.sh
diffstat 1 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/s4-funcs.sh	Sat Sep 24 13:56:15 2016 +0859
+++ b/s4-funcs.sh	Thu Sep 29 14:47:29 2016 +0859
@@ -553,6 +553,13 @@
        fi ;;
    esac)
 }
+sqlquotestr() (
+  case "$1" in
+    *\'*)	v=`echo "$1"| sed "s/'/''/g"`
+		echo "'$v'" ;;
+    *)		echo "'$1'" ;;
+  esac
+)
 mktempd() {
   TMPDIR=$tmpd mktemp -d -t $session
 }
@@ -1053,7 +1060,11 @@
     fi
   fi
   pswd=`getpar pswd`
-  if [ x"$pswd" = x"wasureta" ]; then
+  quser=`sqlquotestr "$user"`
+  dbuser=`query "SELECT name FROM user WHERE name=$quser;"`
+  if [ -z "$dbuser" ]; then
+    return 3
+  elif [ x"$pswd" = x"wasureta" ]; then
     wasureta $user
     return 1		# wasureta error
   fi

yatex.org