Attachment 271151 Details for Bug 400921 – CVS patch

[patch] CVS patch

cvs.patch (text/plain), 4.23 KB, created by Martin Nagy on 2007-11-28 10:19:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Nagy

Created: 2007-11-28 10:19:18 UTC

Size: 4.23 KB

patch

obsolete

>Index: vsfptd-2.0.3-user_config.patch
>===================================================================
>RCS file: vsfptd-2.0.3-user_config.patch
>diff -N vsfptd-2.0.3-user_config.patch
>--- vsfptd-2.0.3-user_config.patch	31 Aug 2005 11:59:44 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- vsftpd-2.0.3/twoprocess.c.test	2005-08-31 11:49:58.000000000 +0200
>-+++ vsftpd-2.0.3/twoprocess.c	2005-08-31 11:58:11.000000000 +0200
>-@@ -422,7 +424,7 @@ handle_per_user_config(const struct myst
>-   {
>-     vsf_parseconf_load_file(str_getbuf(&filename_str), 1);
>-   }
>--  else
>-+  else if (vsf_sysutil_statbuf_get_uid(p_statbuf) != VSFTP_ROOT_UID)
>-   {
>-     die("reading non-root config file"); 
>-   }
>Index: vsftpd-1.2.1-nonrootconf.patch
>===================================================================
>RCS file: /cvs/dist/rpms/vsftpd/RHEL-5/vsftpd-1.2.1-nonrootconf.patch,v
>retrieving revision 1.1
>diff -u -r1.1 vsftpd-1.2.1-nonrootconf.patch
>--- vsftpd-1.2.1-nonrootconf.patch	8 Feb 2005 07:52:54 -0000	1.1
>+++ vsftpd-1.2.1-nonrootconf.patch	28 Nov 2007 10:04:33 -0000
>@@ -1,25 +1,29 @@
>---- vsftpd-2.0.1/twoprocess.c.nonrootconf	2004-07-02 18:47:51.000000000 +0200
>-+++ vsftpd-2.0.1/twoprocess.c	2005-02-08 09:37:26.641905544 +0100
>-@@ -416,12 +416,16 @@
>+--- vsftpd-2.0.1/twoprocess.c.nonrootconf       2004-07-02 18:47:51.000000000 +0200
>++++ vsftpd-2.0.1/twoprocess.c   2005-02-08 09:37:26.641905544 +0100
>+@@ -416,11 +416,17 @@
>    str_append_char(&filename_str, '/');
>    str_append_str(&filename_str, p_user_str);
>    retval = str_stat(&filename_str, &p_statbuf);
> -  /* Security - ignore unless owned by root */
>+-  if (!vsf_sysutil_retval_is_error(retval) &&
>+-      vsf_sysutil_statbuf_get_uid(p_statbuf) == VSFTP_ROOT_UID)
> +  /* Security - die unless owned by root */
>-   if (!vsf_sysutil_retval_is_error(retval) &&
>-       vsf_sysutil_statbuf_get_uid(p_statbuf) == VSFTP_ROOT_UID)
>++  if (!vsf_sysutil_retval_is_error(retval))
>    {
>-     vsf_parseconf_load_file(str_getbuf(&filename_str), 1);
>+-    vsf_parseconf_load_file(str_getbuf(&filename_str), 1);
>++    if (vsf_sysutil_statbuf_get_uid(p_statbuf) == VSFTP_ROOT_UID)
>++    {
>++      vsf_parseconf_load_file(str_getbuf(&filename_str), 1);
>++    }
>++    else
>++    {
>++      die("reading non-root config file"); 
>++    }
>    }
>-+  else
>-+  {
>-+    die("reading non-root config file"); 
>-+  }
>    str_free(&filename_str);
>    vsf_sysutil_free(p_statbuf);
>- }
>---- vsftpd-2.0.1/parseconf.c.nonrootconf	2004-07-02 13:23:56.000000000 +0200
>-+++ vsftpd-2.0.1/parseconf.c	2005-02-08 09:37:26.642905392 +0100
>+--- vsftpd-2.0.1/parseconf.c.nonrootconf        2004-07-02 13:23:56.000000000 +0200
>++++ vsftpd-2.0.1/parseconf.c    2005-02-08 09:37:26.642905392 +0100
> @@ -15,6 +15,7 @@
>  #include "defs.h"
>  #include "sysutil.h"
>@@ -48,14 +52,14 @@
>    {
>      if (errs_fatal)
>      {
>---- vsftpd-2.0.1/vsftpd.8.nonrootconf	2005-02-08 09:37:26.000000000 +0100
>-+++ vsftpd-2.0.1/vsftpd.8	2005-02-08 09:44:21.173887104 +0100
>+--- vsftpd-2.0.1/vsftpd.8.nonrootconf   2005-02-08 09:37:26.000000000 +0100
>++++ vsftpd-2.0.1/vsftpd.8       2005-02-08 09:44:21.173887104 +0100
> @@ -28,7 +28,8 @@
>  .Sh OPTIONS
>  An optional
>  .Op configuration file
> -may be given on the command line.  The default configuration file is
>-+may be given on the command line. This configuration files has to be owned by
>++may be given on the command line. This configuration file has to be owned by
> +root. The default configuration file is
>  .Pa /etc/vsftpd/vsftpd.conf .
>  .Sh SEE ALSO
>Index: vsftpd.spec
>===================================================================
>RCS file: /cvs/dist/rpms/vsftpd/RHEL-5/vsftpd.spec,v
>retrieving revision 1.57
>diff -u -r1.57 vsftpd.spec
>--- vsftpd.spec	14 Nov 2007 15:06:53 -0000	1.57
>+++ vsftpd.spec	28 Nov 2007 10:04:34 -0000
>@@ -28,7 +28,6 @@
> Patch13: vsftpd-2.0.3-background.patch
> Patch14: vsftpd-2.0.3-daemonize_fds.patch
> Patch15: vsftpd-2.0.1-kickline.patch
>-Patch16: vsfptd-2.0.3-user_config.patch
> Patch17: vsftpd-2.0.3-pam_hostname.patch
> Patch18: vsftpd-close-std-fds.patch
> Patch19: vsftpd-2.0.5-default_ipv6.patch
>@@ -81,7 +80,6 @@
> %patch13 -p1 -b .background
> %patch14 -p1 -b .fds
> %patch15 -p1 -b .kickline
>-%patch16 -p1 -b .user_config
> %patch17 -p1 -b .old-pam
> %patch18 -p1 -b .close-fds
> %patch19 -p1 -b .ipv6

Actions: View | Diff

Attachments on bug 400921: 271151