Skip to content

Commit 2035aff

Browse files
committed
Do now show outout deluser $user / synced all error messages
1 parent d9ff24d commit 2035aff

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ test/node_modules/
1515
npm-debug.log
1616
.phpunit.result.cache
1717
.vs
18+
.nova

bin/v-add-user

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ check_result $? "user creation failed" $E_INVALID
6363
echo "$user:$password" | /usr/sbin/chpasswd
6464

6565
if [ $? -ne 0 ]; then
66-
# Delete user on failure again
67-
/usr/sbin/deluser "$user"
68-
echo "Error: Password not accepted by PAM requirements"
66+
# Delete user on failure
67+
/usr/sbin/deluser "$user" > /dev/null 2>&1
68+
echo "Error: Password not accepted due to PAM restrictions"
6969
exit 2
7070
fi
7171

bin/v-add-web-domain-ftp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ echo "$ftp_user:$password" | /usr/sbin/chpasswd
9696

9797
if [ $? -ne 0 ]; then
9898
# Delete user on failure again
99-
/usr/sbin/deluser "$ftp_user"
100-
echo "Error: Password not accepted by PAM"
99+
/usr/sbin/deluser "$ftp_user" > /dev/null 2>&1
100+
echo "Error: Password not accepted due to PAM restrictions"
101101
exit 2
102102
fi
103103

bin/v-change-user-password

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ check_hestia_demo_mode
4949
echo "$user:$password" | /usr/sbin/chpasswd
5050

5151
if [ $? -ne 0 ]; then
52-
echo "Error: Password not changed due to PAM requirements"
52+
echo "Error: Password not accepted due to PAM restrictions"
5353
exit 2
5454
fi
5555

bin/v-change-web-domain-ftp-password

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ check_hestia_demo_mode
5858
echo "$ftp_user:$password" | /usr/sbin/chpasswd
5959

6060
if [ $? -ne 0 ]; then
61-
echo "Error: Password not changed due to PAM requirements"
61+
echo "Error: Password not accepted due to PAM restrictions"
6262
exit 2
6363
fi
6464

0 commit comments

Comments
 (0)