Merge commit 'b7be313cb8f0aa60f828f0d6386d08d6332d081a'

diff --combined cgilite/users.sh
index a389f15c6fb81ef361c13c36b3f9a82e6dd22142,873edf05ffbb72fa9729ff1eb7792c39ac2a86c3..873edf05ffbb72fa9729ff1eb7792c39ac2a86c3
--- 1/cgilite/users.sh
--- 2/users.sh
+++ b/cgilite/users.sh
@@@ -27,9 -27,10 +27,10 @@@ LOCAL_USER='local 
    USER_EXPIRE USER_DEVICES USER_FUTUREUSE
  '
  
+ unset USER_IDMAP
  eval "$UNSET_USER"
  
- user_db="${_DATA}/users.db"
+ user_db="${user_db:-${_DATA}/users.db}"
  
  read_user() {
    local user="$1"
@@@ -127,6 -128,40 +128,40 @@@ new_user()
    fi
  }
  
+ user_idmap(){
+   local uid="$1" ret
+   eval "$LOCAL_USER"
+ 
+   if [ ! "$USER_IDMAP" ]; then
+     while read_user; do
+       USER_IDMAP="${USER_IDMAP}${USER_ID}     ${USER_NAME}${BR}"
+     done <"$user_db"
+   fi
+   if [ "$uid" -a "$USER_IDMAP" != "${USER_IDMAP##*${uid}      }" ]; then
+     ret="${USER_IDMAP##*${uid}        }"; ret="${ret%%${BR}*}";
+     printf '%s\n' "$ret"
+     return 0
+   elif [ "$uid" ]; then
+     return 1
+   else
+     printf '%s' "$USER_IDMAP"
+     return 0
+   fi
+ }
+ 
+ user_idof(){
+   local name="$(STRING "$1")" ret
+   [ "$USER_IDMAP" ] || user_idmap >/dev/null
+ 
+   if [ "${name%\\}" -a "$USER_IDMAP" != "${USER_IDMAP%        ${name}${BR}*}" ]; then
+     ret="${USER_IDMAP%        ${name}${BR}*}"; ret="${ret##*${BR}}"
+     printf '%s\n' "$ret"
+     return 0
+   else
+     return 1
+   fi
+ }
+ 
  user_checkname(){
    { [ $# -gt 0 ] && printf %s "$*" || cat; } \
    | sed -nE '