Attachment 294282 Details for Bug 206843 – Patch to add option --force-background

[patch] Patch to add option --force-background

vsftpd-2.0.1-force_background.patch (text/plain), 3.75 KB, created by Martin Nagy on 2008-02-07 22:48:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Nagy

Created: 2008-02-07 22:48:26 UTC

Size: 3.75 KB

patch

obsolete

>diff -up vsftpd-2.0.1/tunables.c.force_background vsftpd-2.0.1/tunables.c
>--- vsftpd-2.0.1/tunables.c.force_background	2008-02-06 10:54:38.000000000 +0100
>+++ vsftpd-2.0.1/tunables.c	2008-02-06 10:54:38.000000000 +0100
>@@ -67,6 +67,8 @@ int tunable_sslv3 = 0;
> int tunable_tlsv1 = 1;
> int tunable_tilde_user_enable = 0;
> int tunable_lock_upload_files = 1;
>+/* This tunable can only be set by a command line option */
>+int tunable_force_background = 0;
> 
> unsigned int tunable_accept_timeout = 60;
> unsigned int tunable_connect_timeout = 60;
>diff -up vsftpd-2.0.1/standalone.c.force_background vsftpd-2.0.1/standalone.c
>--- vsftpd-2.0.1/standalone.c.force_background	2008-02-06 10:54:38.000000000 +0100
>+++ vsftpd-2.0.1/standalone.c	2008-02-06 10:54:38.000000000 +0100
>@@ -44,7 +44,7 @@ vsf_standalone_main(void)
>   {
>     die("run two copies of vsftpd for IPv4 and IPv6");
>   }
>-  if (tunable_background)
>+  if (tunable_background || tunable_force_background)
>   {
>     int forkret = vsf_sysutil_fork();
>     if (forkret > 0)
>diff -up vsftpd-2.0.1/tunables.h.force_background vsftpd-2.0.1/tunables.h
>--- vsftpd-2.0.1/tunables.h.force_background	2008-02-06 10:54:38.000000000 +0100
>+++ vsftpd-2.0.1/tunables.h	2008-02-06 10:54:38.000000000 +0100
>@@ -63,6 +63,8 @@ extern int tunable_sslv3;               
> extern int tunable_tlsv1;                     /* Allow TLSv1 */
> extern int tunable_tilde_user_enable;         /* Support e.g. ~chris */
> extern int tunable_lock_upload_files;         /* Lock uploading files */
>+/* This tunable can only be set by a command line option */
>+extern int tunable_force_background;          /* Go to background and ignore tunable_background */
> 
> /* Integer/numeric defines */
> extern unsigned int tunable_accept_timeout;
>diff -up vsftpd-2.0.1/vsftpd.8.force_background vsftpd-2.0.1/vsftpd.8
>--- vsftpd-2.0.1/vsftpd.8.force_background	2008-02-06 10:54:38.000000000 +0100
>+++ vsftpd-2.0.1/vsftpd.8	2008-02-06 10:54:38.000000000 +0100
>@@ -6,7 +6,7 @@
> .Nd Very Secure FTP Daemon
> .Sh SYNOPSIS
> .Nm vsftpd
>-.Op Ar configuration file
>+.Op Ar configuration file [ Nm --force-background ]
> .Sh DESCRIPTION
> .Nm vsftpd
> is the Very Secure File Transfer Protocol Daemon. The server can be launched
>@@ -28,8 +28,13 @@ binary will then launch the FTP service 
> .Sh OPTIONS
> An optional
> .Op configuration file
>-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 .
>+If the
>+.Nm --force-background
>+option is used, vsftpd will behave as if
>+.Pa background=YES
>+option was set and will ignore the users choice in the configuration file.
> .Sh SEE ALSO
> .Xr vsftpd.conf 5
>diff -up vsftpd-2.0.1/main.c.force_background vsftpd-2.0.1/main.c
>--- vsftpd-2.0.1/main.c.force_background	2008-02-06 10:54:38.000000000 +0100
>+++ vsftpd-2.0.1/main.c	2008-02-06 10:54:38.000000000 +0100
>@@ -70,7 +70,7 @@ main(int argc, const char* argv[])
>   /* Zero or one argument supported. If one argument is passed, it is the
>    * path to the config file
>    */
>-  if (argc > 2)
>+  if (argc > 3)
>   {
>     die("vsftpd: too many arguments (I take an optional config file only)");
>   }
>@@ -87,6 +87,19 @@ main(int argc, const char* argv[])
>     p_config_name = argv[1];
>     config_specified = 1;
>   }
>+  else if (argc == 3)
>+  {
>+    if (!vsf_sysutil_strcmp(argv[2], "--force-background"))
>+    {
>+      tunable_force_background = 1;
>+    }
>+    else
>+    {
>+     die("vsftpd: too many arguments (I take an optional config file only)");
>+    }
>+    p_config_name = argv[1];
>+    config_specified = 1;
>+  }
>   /* This might need to open /dev/zero on systems lacking MAP_ANON. Needs
>    * to be done early (i.e. before config file parse, which may use
>    * anonymous pages

Actions: View | Diff

Attachments on bug 206843: 161959 | 293886 | 294282 | 294283