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-af44
1 files changed, 31 insertions, 13 deletions
diff --git a/net/vsftpd/patches/patch-af b/net/vsftpd/patches/patch-af
index 7e25224afa7..e4738214445 100644
--- a/net/vsftpd/patches/patch-af
+++ b/net/vsftpd/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $
+$NetBSD: patch-af,v 1.3 2004/01/01 04:39:22 salo Exp $
---- vsftpd.conf.5.orig 2003-05-28 00:50:28.000000000 +0200
-+++ vsftpd.conf.5 2003-05-29 19:45:56.000000000 +0200
+--- 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 @@
.SH DESCRIPTION
vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
@@ -29,7 +29,16 @@ $NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $
.BR banned_email_file
setting.
-@@ -528,7 +528,7 @@
+@@ -306,7 +306,7 @@
+ file specified by the
+ .BR email_password_file
+ setting. The file format is one password per line, no extra whitespace. The
+-default filename is /etc/vsftpd.email_passwords.
++default filename is @PKG_SYSCONFDIR@/vsftpd.email_passwords.
+
+ Default: NO
+ .TP
+@@ -541,7 +541,7 @@
.BR deny_email_enable
is enabled.
@@ -38,16 +47,25 @@ $NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $
.TP
.B banner_file
This option is the name of a file containing text to display when someone
-@@ -556,7 +556,7 @@
- .BR chroot_local_user
- is disabled.
+@@ -570,7 +570,7 @@
+ is enabled, then the list file becomes a list of users to NOT place in a
+ chroot() jail.
-Default: /etc/vsftpd.chroot_list
+Default: @PKG_SYSCONFDIR@/vsftpd.chroot_list
.TP
.B cmds_allowed
This options specifies a comma separated list of allowed FTP commands (post
-@@ -638,7 +638,7 @@
+@@ -606,7 +606,7 @@
+ .BR secure_email_list_enable
+ setting.
+
+-Default: /etc/vsftpd.email_passwords
++Default: @PKG_SYSCONFDIR@/vsftpd.email_passwords
+ .TP
+ .B ftp_username
+ This is the name of the user we use for handling anonymous FTP. The home
+@@ -692,7 +692,7 @@
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.
@@ -56,7 +74,7 @@ $NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $
.TP
.B user_config_dir
This powerful option allows the override of any config option specified in
-@@ -646,10 +646,10 @@
+@@ -700,10 +700,10 @@
with an example. If you set
.BR user_config_dir
to be
@@ -67,14 +85,14 @@ $NetBSD: patch-af,v 1.2 2003/05/29 20:08:42 salo Exp $
-.BR /etc/vsftpd_user_conf/chris
+.BR @PKG_SYSCONFDIR@/vsftpd_user_conf/chris
for the duration of the session. The format of this file is as detailed in
- this manual page!
-
-@@ -660,7 +660,7 @@
+ 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 @@
.BR userlist_enable
option is active.
-Default: /etc/vsftpd.user_list
+Default: @PKG_SYSCONFDIR@/vsftpd.user_list
- .BR
+ .TP
.B vsftpd_log_file
This option is the name of the file to which we write the vsftpd style