rpms/vsftpd/F-11 vsftpd.init,1.5,1.6 vsftpd.spec,1.89,1.90

[Jiri Skala]

Author: jskala

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

Modified Files:
	vsftpd.init vsftpd.spec 
Log Message:
* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 2.1.2-2
- back ported fix #524208 - Error message when starting vsftpd service with multiple conf...



Index: vsftpd.init
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-11/vsftpd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- vsftpd.init	25 Feb 2008 16:25:30 -0000	1.5
+++ vsftpd.init	18 Oct 2009 18:55:10 -0000	1.6
@@ -37,7 +37,7 @@ start() {
 
         if [ -d /etc/vsftpd ] ; then
                 CONFS=`ls /etc/vsftpd/*.conf 2>/dev/null`
-                [ -z $CONFS ] && exit 6
+                [ -z "$CONFS" ] && exit 6
                 for i in $CONFS; do
                         site=`basename $i .conf`
                         echo -n $"Starting $prog for $site: "


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-11/vsftpd.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- vsftpd.spec	2 Jun 2009 09:21:10 -0000	1.89
+++ vsftpd.spec	18 Oct 2009 18:55:10 -0000	1.90
@@ -2,7 +2,7 @@
 
 Name: vsftpd
 Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
@@ -132,6 +132,9 @@ fi
 
 
 %changelog
+* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 2.1.2-2
+- back ported fix #524208 - Error message when starting vsftpd service with multiple conf...
+
 * Tue Jun 02 2009 Jiri Skala <jskala at redhat.com> - 2.1.2-1
 - update to latest upstream version