1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
diff --unified defs.h defs.h
--- defs.h 2004-06-04 16:37:29.000000000 +0200
+++ defs.h 2004-09-24 11:36:16.443227600 +0200
@@ -1,7 +1,7 @@
#ifndef VSF_DEFS_H
#define VSF_DEFS_H
-#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf"
+#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf"
#define VSFTP_COMMAND_FD 0
Common subdirectories: dummyinc and dummyinc
Common subdirectories: EXAMPLE and EXAMPLE
Only in : gentoo.diff
Common subdirectories: port and port
Common subdirectories: RedHat and RedHat
Common subdirectories: SECURITY and SECURITY
diff --unified tunables.c tunables.c
--- tunables.c 2004-07-02 13:26:17.000000000 +0200
+++ tunables.c 2004-09-24 11:43:21.714576528 +0200
@@ -87,19 +87,19 @@
unsigned int tunable_max_per_ip = 0;
unsigned int tunable_trans_chunk_size = 0;
-const char* tunable_secure_chroot_dir = "/usr/share/empty";
+const char* tunable_secure_chroot_dir = "/usr/share/vsftpd/empty";
const char* tunable_ftp_username = "ftp";
const char* tunable_chown_username = "root";
const char* tunable_xferlog_file = "/var/log/xferlog";
-const char* tunable_vsftpd_log_file = "/var/log/vsftpd.log";
+const char* tunable_vsftpd_log_file = "/var/log/vsftpd/vsftpd.log";
const char* tunable_message_file = ".message";
const char* tunable_nopriv_user = "nobody";
const char* tunable_ftpd_banner = 0;
-const char* tunable_banned_email_file = "/etc/vsftpd.banned_emails";
-const char* tunable_chroot_list_file = "/etc/vsftpd.chroot_list";
-const char* tunable_pam_service_name = "ftp";
+const char* tunable_banned_email_file = "/etc/vsftpd/vsftpd.banned_emails";
+const char* tunable_chroot_list_file = "/etc/vsftpd/vsftpd.chroot_list";
+const char* tunable_pam_service_name = "vsftpd";
const char* tunable_guest_username = "ftp";
-const char* tunable_userlist_file = "/etc/vsftpd.user_list";
+const char* tunable_userlist_file = "/etc/vsftpd/vsftpd.user_list";
const char* tunable_anon_root = 0;
const char* tunable_local_root = 0;
const char* tunable_banner_file = 0;
@@ -111,7 +111,7 @@
const char* tunable_hide_file = 0;
const char* tunable_deny_file = 0;
const char* tunable_user_sub_token = 0;
-const char* tunable_email_password_file = "/etc/vsftpd.email_passwords";
+const char* tunable_email_password_file = "/etc/vsftpd/vsftpd.email_passwords";
const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem";
const char* tunable_dsa_cert_file = 0;
const char* tunable_ssl_ciphers = "DES-CBC3-SHA";
diff --unified vsftpd.8 vsftpd.8
--- vsftpd.8 2003-08-29 00:34:54.000000000 +0200
+++ vsftpd.8 2004-09-24 11:44:42.429306024 +0200
@@ -21,7 +21,7 @@
recommended. It is activated by setting
.Pa listen=YES
in
-.Pa /etc/vsftpd.conf .
+.Pa /etc/vsftpd/vsftpd.conf .
Direct execution of the
.Nm vsftpd
binary will then launch the FTP service ready for immediate client connections.
@@ -29,6 +29,6 @@
An optional
.Op configuration file
may be given on the command line. The default configuration file is
-.Pa /etc/vsftpd.conf .
+.Pa /etc/vsftpd/vsftpd.conf .
.Sh SEE ALSO
.Xr vsftpd.conf 5
diff --unified vsftpd.conf.5 vsftpd.conf.5
--- vsftpd.conf.5 2004-07-02 12:39:11.000000000 +0200
+++ vsftpd.conf.5 2004-09-24 11:47:19.060494464 +0200
@@ -4,7 +4,7 @@
.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
-.BR /etc/vsftpd.conf .
+.BR /etc/vsftpd/vsftpd.conf .
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
@@ -136,7 +136,7 @@
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
-/etc/vsftpd.chroot_list, but you may override this with the
+/etc/vsftpd/vsftpd.chroot_list, but you may override this with the
.BR chroot_list_file
setting.
@@ -164,7 +164,7 @@
.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
-/etc/vsftpd.banned_emails, but you may override this with the
+/etc/vsftpd/vsftpd.banned_emails, but you may override this with the
.BR banned_email_file
setting.
@@ -192,7 +192,7 @@
If enabled, two log files are generated in parallel, going by default to
.BR /var/log/xferlog
and
-.BR /var/log/vsftpd.log .
+.BR /var/log/vsftpd/vsftpd.log .
The former is a wu-ftpd style transfer log, parseable by standard tools. The
latter is vsftpd's own style log.
@@ -355,7 +355,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 /etc/vsftpd/vsftpd.email_passwords.
Default: NO
.TP
@@ -635,7 +635,7 @@
.BR deny_email_enable
is enabled.
-Default: /etc/vsftpd.banned_emails
+Default: /etc/vsftpd/vsftpd.banned_emails
.TP
.B banner_file
This option is the name of a file containing text to display when someone
@@ -664,7 +664,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: /etc/vsftpd/vsftpd.chroot_list
.TP
.B cmds_allowed
This options specifies a comma separated list of allowed FTP commands (post
@@ -706,7 +706,7 @@
.BR secure_email_list_enable
setting.
-Default: /etc/vsftpd.email_passwords
+Default: /etc/vsftpd/vsftpd.email_passwords
.TP
.B ftp_username
This is the name of the user we use for handling anonymous FTP. The home
@@ -816,10 +816,10 @@
with an example. If you set
.BR user_config_dir
to be
-.BR /etc/vsftpd_user_conf
+.BR /etc/vsftpd/vsftpd.user_conf
and then log on as the user "chris", then vsftpd will apply the settings in
the file
-.BR /etc/vsftpd_user_conf/chris
+.BR /etc/vsftpd/vsftpd.user_conf/chris
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
@@ -855,7 +855,7 @@
.BR userlist_enable
option is active.
-Default: /etc/vsftpd.user_list
+Default: /etc/vsftpd/vsftpd.user_list
.TP
.B vsftpd_log_file
This option is the name of the file to which we write the vsftpd style
@@ -869,7 +869,7 @@
.BR syslog_enable ,
then this file is not written and output is sent to the system log instead.
-Default: /var/log/vsftpd.log
+Default: /var/log/vsftpd/vsftpd.log
.TP
.B xferlog_file
This option is the name of the file to which we write the wu-ftpd style
|
GitWeb