summaryrefslogtreecommitdiff
path: root/net/vsftpd/patches/patch-af
diff options
context:
space:
mode:
Diffstat (limited to 'net/vsftpd/patches/patch-af')
-rw-r--r--net/vsftpd/patches/patch-af31
1 files changed, 15 insertions, 16 deletions
diff --git a/net/vsftpd/patches/patch-af b/net/vsftpd/patches/patch-af
index e4738214445..8cd53a2bbd4 100644
--- a/net/vsftpd/patches/patch-af
+++ b/net/vsftpd/patches/patch-af
@@ -1,8 +1,7 @@
-$NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
-
---- vsftpd.conf.5.orig 2003-11-12 02:06:25.000000000 +0100
-+++ vsftpd.conf.5 2004-01-01 05:19:28.000000000 +0100
-@@ -4,7 +4,7 @@
+$NetBSD: patch-af,v 1.4 2006/01/13 18:12:46 wiz Exp $
+--- vsftpd.conf.5.orig 2006-01-07 20:35:50.000000000 +0100
++++ vsftpd.conf.5
+@@ -4,7 +4,7 @@ vsftpd.conf \- config file for vsftpd
.SH DESCRIPTION
vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
default, vsftpd looks for this file at the location
@@ -11,7 +10,7 @@ $NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
However, you may override this by specifying a command line argument to
vsftpd. The command line argument is the pathname of the configuration file
for vsftpd. This behaviour is useful because you may wish to use an advanced
-@@ -128,7 +128,7 @@
+@@ -136,7 +136,7 @@ chroot() jail in their home directory up
different if chroot_local_user is set to YES. In this case, the list becomes
a list of users which are NOT to be placed in a chroot() jail.
By default, the file containing this list is
@@ -20,7 +19,7 @@ $NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
.BR chroot_list_file
setting.
-@@ -156,7 +156,7 @@
+@@ -164,7 +164,7 @@ Default: NO (but the sample config file
.B deny_email_enable
If activated, you may provide a list of anonymous password e-mail responses
which cause login to be denied. By default, the file containing this list is
@@ -29,7 +28,7 @@ $NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
.BR banned_email_file
setting.
-@@ -306,7 +306,7 @@
+@@ -392,7 +392,7 @@ anonymous logins are prevented unless th
file specified by the
.BR email_password_file
setting. The file format is one password per line, no extra whitespace. The
@@ -38,7 +37,7 @@ $NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
Default: NO
.TP
-@@ -541,7 +541,7 @@
+@@ -672,7 +672,7 @@ passwords which are not permitted. This
.BR deny_email_enable
is enabled.
@@ -47,7 +46,7 @@ $NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
.TP
.B banner_file
This option is the name of a file containing text to display when someone
-@@ -570,7 +570,7 @@
+@@ -701,7 +701,7 @@ is enabled. If the option
is enabled, then the list file becomes a list of users to NOT place in a
chroot() jail.
@@ -56,7 +55,7 @@ $NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
.TP
.B cmds_allowed
This options specifies a comma separated list of allowed FTP commands (post
-@@ -606,7 +606,7 @@
+@@ -753,7 +753,7 @@ This option can be used to provide an al
.BR secure_email_list_enable
setting.
@@ -65,16 +64,16 @@ $NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
.TP
.B ftp_username
This is the name of the user we use for handling anonymous FTP. The home
-@@ -692,7 +692,7 @@
+@@ -858,7 +858,7 @@ This option should be the name of a dire
directory should not be writable by the ftp user. This directory is used
as a secure chroot() jail at times vsftpd does not require filesystem access.
-Default: /usr/share/empty
+Default: /var/chroot/vsftpd
.TP
- .B user_config_dir
- This powerful option allows the override of any config option specified in
-@@ -700,10 +700,10 @@
+ .B ssl_ciphers
+ This option can be used to select which SSL ciphers vsftpd will allow for
+@@ -876,10 +876,10 @@ the manual page, on a per-user basis. Us
with an example. If you set
.BR user_config_dir
to be
@@ -87,7 +86,7 @@ $NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
for the duration of the session. The format of this file is as detailed in
this manual page! PLEASE NOTE that not all settings are effective on a
per-user basis. For example, many settings only prior to the user's session
-@@ -739,7 +739,7 @@
+@@ -915,7 +915,7 @@ This option is the name of the file load
.BR userlist_enable
option is active.