Attachment 147984 Details for Bug 218307 – better rename patch

[patch] better rename patch

vsftpd-1.2.1-rename.patch (text/plain), 1.55 KB, created by Maros Barabas on 2007-02-13 12:46:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maros Barabas

Created: 2007-02-13 12:46:50 UTC

Size: 1.55 KB

patch

obsolete

>--- vsftpd-1.2.1/postlogin.c.rename	2003-11-05 04:39:51.000000000 +0100
>+++ vsftpd-1.2.1/postlogin.c	2007-02-13 13:35:05.000000000 +0100
>@@ -938,12 +938,15 @@
> static void
> handle_upload_common(struct vsf_session* p_sess, int is_append, int is_unique)
> {
>+  static struct vsf_sysutil_statbuf* p_statbuf;
>   static struct mystr s_filename;
>   struct mystr* p_filename;
>   struct vsf_transfer_ret trans_ret;
>   int new_file_fd;
>   int remote_fd;
>   int retval;
>+  int exist;
>+
>   filesize_t offset = p_sess->restart_pos;
>   p_sess->restart_pos = 0;
>   if (!pasv_active(p_sess) && !port_active(p_sess))
>@@ -952,11 +955,23 @@
>     return;
>   }
>   p_filename = &p_sess->ftp_arg_str;
>-  if (is_unique)
>+
>+  /* Does the file exist? */
>+  exist = str_stat(&p_sess->ftp_arg_str, &p_statbuf);
>+  if (exist == 0 && !is_unique)
>+    if (!vsf_access_check_file(p_filename))
>+    {
>+       vsf_cmdio_write(p_sess, FTP_NOPERM, "Permission denied.");
>+       return;
>+    }
>+
>+  if (exist == 0 || is_unique)
>   {
>+    /* File exists or STOU - make unique file */
>     get_unique_filename(&s_filename, p_filename);
>     p_filename = &s_filename;
>   }
>+
>   if (!vsf_access_check_file(p_filename))
>   {
>     vsf_cmdio_write(p_sess, FTP_NOPERM, "Permission denied.");
>@@ -1051,6 +1066,11 @@
>   port_cleanup(p_sess);
>   pasv_cleanup(p_sess);
>   vsf_sysutil_close(new_file_fd);
>+  if (exist == 0 && retval == 0)
>+  /* NOTE - might overwrite destination file. Not a concern because the same
>+   * could be accomplished with DELE.
>+   */
>+    retval = str_rename(p_filename, &p_sess->ftp_arg_str);
> }
> 
> static void

Actions: View | Diff

Attachments on bug 218307: 147984