--- a/s4-funcs.sh	Sat Jun 06 11:21:01 2020 +0900
+++ b/s4-funcs.sh	Sat Jun 06 11:43:42 2020 +0900
@@ -87,10 +87,9 @@
   *)				touchpanel="" ;;
 esac
 
-# If S4MASTERDB is set, behave as ANNEX s4
+# If S4MASTERDB is set, behave in another world
 if [ -n "$S4MASTERDB" -a -s "$S4MASTERDB" ]; then
-  # $S4ANNEX is set after s4-annex setup
-  . ./s4-annex.sh 2>> tmp/debug.out
+  . ./s4-world.sh 2>> tmp/debug.out
 fi
 v=""
 for i in $S4WORLDS; do
@@ -1238,10 +1237,10 @@
   for kv in `echo $HTTP_COOKIE|sed 's/[;, ]/ /g'`; do
     k="${kv%%=*}"
     v="`echo ${kv#*=}|nkf -Ww -mQ|sed -e 's/\"/\"\"/g'`"
-err "GetCookie: $k=[$v]"
+    ## err "GetCookie: $k=[$v]"
     case "$k" in
       user)	_user="$v" ;;
-      skey)	_skey="$v"; k=skey ;;
+      skey)	_skey="$v" ;;
     esac
     query "replace into cookie values('$session', '$k', 'string', \"$v\");"
   done
@@ -1348,7 +1347,7 @@
   # $1=passwd
   dbpswd=`getpwfield $user pswd`
   encpswd=`mycrypt "$1" "$dbpswd"`
-  # err user=$user, pswd=$1, db=$dbpswd, enc=$encpswd
+  ## err user=$user, pswd=$1, db=$dbpswd, enc=$encpswd
   [ x"$dbpswd" = x"$encpswd" ]
 }
 mypwhash() {
@@ -1401,7 +1400,6 @@
     newsession=`genrandom 34`
     if setskey "$user" "$newsession" &&
 	dbsetbyid user "$user" login "`date '+%F %T'`"; then
-      # err gencookie "user=$user" "skey=$newsession"
       gencookie "user=$user" "skey=$newsession"
       return 0
     else