File tree Expand file tree Collapse file tree 4 files changed +27
-0
lines changed
Expand file tree Collapse file tree 4 files changed +27
-0
lines changed Original file line number Diff line number Diff line change @@ -62,6 +62,13 @@ check_result $? "user creation failed" $E_INVALID
6262# Adding password
6363echo " $user :$password " | /usr/sbin/chpasswd
6464
65+ if [ $? -ne 0 ]; then
66+ # Delete user on failure again
67+ /usr/sbin/deluser " $user "
68+ echo " Error: Password not accepted by PAM requirements"
69+ exit 2
70+ fi
71+
6572# Add a general group for normal users created by Hestia
6673if [ -z " $( grep ^hestia-users: /etc/group) " ]; then
6774 groupadd --system " hestia-users"
Original file line number Diff line number Diff line change 9393
9494# Set ftp user password
9595echo " $ftp_user :$password " | /usr/sbin/chpasswd
96+
97+ if [ $? -ne 0 ]; then
98+ # Delete user on failure again
99+ /usr/sbin/deluser " $ftp_user "
100+ echo " Error: Password not accepted by PAM"
101+ exit 2
102+ fi
103+
96104ftp_md5=$( awk -v user=$ftp_user -F : ' user == $1 {print $2}' /etc/shadow)
97105
98106# Adding jailed sftp env
Original file line number Diff line number Diff line change @@ -47,6 +47,12 @@ check_hestia_demo_mode
4747
4848# Changing user password
4949echo " $user :$password " | /usr/sbin/chpasswd
50+
51+ if [ $? -ne 0 ]; then
52+ echo " Error: Password not changed due to PAM requirements"
53+ exit 2
54+ fi
55+
5056md5=$( awk -v user=$user -F : ' user == $1 {print $2}' /etc/shadow)
5157
5258if [ " $user " = ' admin' ] && [ -e " $HESTIA /web/reset.admin" ]; then
Original file line number Diff line number Diff line change @@ -56,6 +56,12 @@ check_hestia_demo_mode
5656
5757# Changing ftp user password
5858echo " $ftp_user :$password " | /usr/sbin/chpasswd
59+
60+ if [ $? -ne 0 ]; then
61+ echo " Error: Password not changed due to PAM requirements"
62+ exit 2
63+ fi
64+
5965ftp_md5=$( awk -v user=$ftp_user -F : ' user == $1 {print $2}' /etc/shadow)
6066
6167
You can’t perform that action at this time.
0 commit comments