rpms/vsftpd/F-10 vsftpd.init,1.5,1.6 vsftpd.spec,1.84,1.85

[Jiri Skala]

Author: jskala

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

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



Index: vsftpd.init
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/F-10/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:52:57 -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-10/vsftpd.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- vsftpd.spec	3 Jun 2009 07:47:20 -0000	1.84
+++ vsftpd.spec	18 Oct 2009 18:52:58 -0000	1.85
@@ -3,7 +3,7 @@
 Summary: Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 # OpenSSL link exception
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -161,6 +161,9 @@ fi
 %{_var}/ftp
 
 %changelog
+* Sun Oct 18 2009 Jiri Skala <jskala at redhat.com> - 2.0.7-3
+- back ported fix #524208 - Error message when starting vsftpd service with multiple conf...
+
 * Tue Jun 02 2009 Jiri Skala <jskala at redhat.com> - 2.0.7-2
 - fix #483604