- fixes #544251 - /etc/rc.d/init.d/vsftpd does not start more than one

daemon

vsftpd.init

@@ -38,22 +38,26 @@ start() {
         if [ -d /etc/vsftpd ] ; then
                 CONFS=`ls /etc/vsftpd/*.conf 2>/dev/null`
                 [ -z "$CONFS" ] && exit 6
+                PROC_FAILED=0
                 for i in $CONFS; do
                         site=`basename $i .conf`
                         echo -n $"Starting $prog for $site: "
                         daemon /usr/sbin/vsftpd $i
                         RETVAL=$?
                         echo
-                        if [ $RETVAL -eq 0 ]; then
+                        if [ $RETVAL -eq 0 ] && [ ! -f /var/lock/subsys/$prog ]; then
                                 touch /var/lock/subsys/$prog
-                                break
+                        elif [ $RETVAL -ne 0 ]; then
-                        else
+                                ps -FC vsftpd | grep "$i" > /dev/null
-                                if [ -f /var/lock/subsys/$prog ]; then
+                                RETVAL=$?
-                                        RETVAL=0
+                                if [ $PROC_FAILED -eq 0 ] && [ $RETVAL -ne 0 ]; then
-                                        break
+                                        PROC_FAILED=1
                                 fi
                         fi
                 done
+                if [ $RETVAL -eq 0 ] && [ $PROC_FAILED -ne 0 ]; then
+                        RETVAL=1
+                fi
         else
                 RETVAL=1
         fi

vsftpd.spec

@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.2.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -142,6 +142,9 @@ fi
 
 
 %changelog
+* Tue Mar 16 2010 Jiri Skala <jskala@redhat.com> - 2.2.2-4
+- fixes #544251 - /etc/rc.d/init.d/vsftpd does not start more than one daemon
+
 * Mon Feb 15 2010 Jiri Skala <jskala@redhat.com> - 2.2.2-3
 - fixes #565067 - FTBFS: ImplicitDSOLinking