rpms/vsftpd/F-13 vsftpd.init,1.7,1.8 vsftpd.spec,1.105,1.106

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/vsftpd/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13434

Modified Files:
	vsftpd.init vsftpd.spec 
Log Message:
* Tue Mar 16 2010 Jiri Skala <jskala at redhat.com> - 2.2.2-4
- fixes #544251 - /etc/rc.d/init.d/vsftpd does not start more than one daemon



Index: vsftpd.init
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-13/vsftpd.init,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- vsftpd.init	15 Sep 2009 12:18:06 -0000	1.7
+++ vsftpd.init	16 Mar 2010 09:55:57 -0000	1.8
@@ -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
-                        else
-                                if [ -f /var/lock/subsys/$prog ]; then
-                                        RETVAL=0
-                                        break
+                        elif [ $RETVAL -ne 0 ]; then
+                                ps -FC vsftpd | grep "$i" > /dev/null
+                                RETVAL=$?
+                                if [ $PROC_FAILED -eq 0 ] && [ $RETVAL -ne 0 ]; then
+                                        PROC_FAILED=1
                                 fi
                         fi
                 done
+                if [ $RETVAL -eq 0 ] && [ $PROC_FAILED -ne 0 ]; then
+                        RETVAL=1
+                fi
         else
                 RETVAL=1
         fi


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-13/vsftpd.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- vsftpd.spec	15 Feb 2010 13:46:19 -0000	1.105
+++ vsftpd.spec	16 Mar 2010 09:55:57 -0000	1.106
@@ -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 at 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 at redhat.com> - 2.2.2-3
 - fixes #565067 - FTBFS: ImplicitDSOLinking