@@ -51,7 +51,7 @@ is_password_valid
get_domain_values 'web'
# Defining ftp user shell
-shell='/sbin/nologin'
+shell=$(which nologin)
if [ ! -z "$FTP_SHELL" ]; then
shell=$FTP_SHELL
fi
@@ -268,7 +268,7 @@ rebuild_web_domain_conf() {
# Adding ftp users
if [ -z "$FTP_SHELL" ]; then
- shell='/sbin/nologin'
+ shell=$(which nologin)
if [ -e "/usr/bin/rssh" ]; then
shell='/usr/bin/rssh'
@@ -886,6 +886,9 @@ if [ "$vsftpd" = 'yes' ]; then
update-rc.d vsftpd defaults
service vsftpd start
check_result $? "vsftpd start failed"
+
+ # To be deleted after release 0.9.8-18
+ echo "/sbin/nologin" >> /etc/shells
@@ -937,6 +937,9 @@ if [ "$vsftpd" = 'yes' ]; then
chkconfig vsftpd on
@@ -901,6 +901,9 @@ if [ "$vsftpd" = 'yes' ]; then