rpms/vsftpd/devel vsftpd-2.0.5-fix_unique.patch, NONE, 1.1 vsftpd.spec, 1.68, 1.69

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28116

Modified Files:
	vsftpd.spec 
Added Files:
	vsftpd-2.0.5-fix_unique.patch 
Log Message:
- Fix bad handling of unique files (#392231).


vsftpd-2.0.5-fix_unique.patch:

--- NEW FILE vsftpd-2.0.5-fix_unique.patch ---
diff -up vsftpd-2.0.5/postlogin.c.fix_unique vsftpd-2.0.5/postlogin.c
--- vsftpd-2.0.5/postlogin.c.fix_unique	2007-11-30 11:16:10.000000000 +0100
+++ vsftpd-2.0.5/postlogin.c	2007-11-30 11:23:57.000000000 +0100
@@ -1701,6 +1701,12 @@ get_unique_filename(struct mystr* p_outs
   static struct vsf_sysutil_statbuf* s_p_statbuf;
   unsigned int suffix = 1;
   int retval;
+  retval = str_stat(p_base_str, &s_p_statbuf);
+  if (vsf_sysutil_retval_is_error(retval))
+  {
+    str_copy(p_outstr, p_base_str);
+    return;
+  }
   while (1)
   {
     str_copy(p_outstr, p_base_str);


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vsftpd.spec	30 Nov 2007 08:52:44 -0000	1.68
+++ vsftpd.spec	30 Nov 2007 11:22:50 -0000	1.69
@@ -43,6 +43,7 @@
 Patch29: vsftpd-2.0.5-pasv_dot.patch
 Patch30: vsftpd-2.0.5-pam_end.patch
 Patch31: vsftpd-2.0.5-write_race.patch
+Patch32: vsftpd-2.0.5-fix_unique.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -100,6 +101,7 @@
 %patch29 -p1 -b .pasv_dot
 %patch30 -p1 -b .pam_end
 %patch31 -p1 -b .write_race
+%patch32 -p1 -b .fix_unique
 
 %build
 %ifarch s390x
@@ -162,6 +164,7 @@
 - Remove uniq_rename patch.
 - Correct create/lock race condition, original patch by <mpoole at redhat.com>
   (#240550).
+- Fix bad handling of unique files (#392231).
 
 * Thu Nov 08 2007 Martin Nagy <mnagy at redhat.com> - 2.0.5-20
 - Correct calling of pam_end (#235843).