s4

changeset 298:ec267a1d27ee

find changesets by author, revision, files, or words in the commit message
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 diff
     1.1 --- a/s4-funcs.sh	Sat Sep 24 13:56:15 2016 +0859
     1.2 +++ b/s4-funcs.sh	Thu Sep 29 14:47:29 2016 +0859
     1.3 @@ -553,6 +553,13 @@
     1.4         fi ;;
     1.5     esac)
     1.6  }
     1.7 +sqlquotestr() (
     1.8 +  case "$1" in
     1.9 +    *\'*)	v=`echo "$1"| sed "s/'/''/g"`
    1.10 +		echo "'$v'" ;;
    1.11 +    *)		echo "'$1'" ;;
    1.12 +  esac
    1.13 +)
    1.14  mktempd() {
    1.15    TMPDIR=$tmpd mktemp -d -t $session
    1.16  }
    1.17 @@ -1053,7 +1060,11 @@
    1.18      fi
    1.19    fi
    1.20    pswd=`getpar pswd`
    1.21 -  if [ x"$pswd" = x"wasureta" ]; then
    1.22 +  quser=`sqlquotestr "$user"`
    1.23 +  dbuser=`query "SELECT name FROM user WHERE name=$quser;"`
    1.24 +  if [ -z "$dbuser" ]; then
    1.25 +    return 3
    1.26 +  elif [ x"$pswd" = x"wasureta" ]; then
    1.27      wasureta $user
    1.28      return 1		# wasureta error
    1.29    fi