From: Paul Hänsch <paul@plutz.net>
Date: Fri, 16 Feb 2024 17:40:56 +0000 (+0100)
Subject: Merge commit 'fe19ba17990219b7c16c6e2397975b39377a5db8'
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=51e33bff2fa9da601b3d3a17717ae919eec2ba45;hp=-c;p=shellwiki

Merge commit 'fe19ba17990219b7c16c6e2397975b39377a5db8'
---

51e33bff2fa9da601b3d3a17717ae919eec2ba45
diff --combined cgilite/users.sh
index f616ca0,4d7965a..4d7965a
--- a/cgilite/users.sh
+++ b/cgilite/users.sh
@@@ -429,7 -429,7 +429,7 @@@ user_update()
  
          uid="$(POST uid)"
        oldpw="$(POST oldpw)"
-          pw="$(POST pw |grep -xE '.{6}')"
+          pw="$(POST pw |grep -m1 -xE '.{6,}')"
    pwconfirm="$(POST pwconfirm)"
  
  
@@@ -442,7 -442,7 +442,7 @@@
        update_user "${uid}" password="$pw"
        REDIRECT "${_BASE}${PATH_INFO}#UPDATE_SUCCESS"
      else
-       REDIRECT "${_BASE}${PATH_INFO}#ERROR_PWMISMATCH"
+       REDIRECT "${_BASE}${PATH_INFO}#ERROR_PW_MISMATCH"
      fi
    elif [ "$UID_" = "$USER_ID" ]; then
      REDIRECT "${_BASE}${PATH_INFO}#ERROR_INVALID_AUTH_PASSWORD"