Attachment #38533 for bug #60401

View | Details | Raw Unified | Return to bug 60401
Collapse All | Expand All

Lines 1-7 Link Here

(-)vsftpd-2.0.1/defs.h (-1 / +1 lines)
1	#ifndef VSF_DEFS_H	1	#ifndef VSF_DEFS_H
2	#define VSF_DEFS_H	2	#define VSF_DEFS_H
3		3
4	#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf"	4	#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf"
5		5
6	#define VSFTP_COMMAND_FD 0	6	#define VSFTP_COMMAND_FD 0
7		7




unsigned int tunable_max_per_ip = 0;
unsigned int tunable_trans_chunk_size = 0;

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/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/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/vsftpd.user_list";
const char* tunable_anon_root = 0;
const char* tunable_local_root = 0;
const char* tunable_banner_file = 0;

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/vsftpd.email_passwords";
const char* tunable_rsa_cert_file = "/etc/ssl/certs/vsftpd.pem";
const char* tunable_dsa_cert_file = 0;
const char* tunable_ssl_ciphers = "DES-CBC3-SHA";


Lines 21-27 Link Here

(-)vsftpd-2.0.1/vsftpd.8 (-2 / +2 lines)
21	recommended. It is activated by setting	21	recommended. It is activated by setting
22	.Pa listen=YES	22	.Pa listen=YES
23	in	23	in
24	.Pa /etc/vsftpd.conf .	24	.Pa /etc/vsftpd/vsftpd.conf .
25	Direct execution of the	25	Direct execution of the
26	.Nm vsftpd	26	.Nm vsftpd
27	binary will then launch the FTP service ready for immediate client connections.	27	binary will then launch the FTP service ready for immediate client connections.
Lines 29-34 Link Here
29	An optional	29	An optional
30	.Op configuration file	30	.Op configuration file
31	may be given on the command line. The default configuration file is	31	may be given on the command line. The default configuration file is
32	.Pa /etc/vsftpd.conf .	32	.Pa /etc/vsftpd/vsftpd.conf .
33	.Sh SEE ALSO	33	.Sh SEE ALSO
34	.Xr vsftpd.conf 5	34	.Xr vsftpd.conf 5




.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/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

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/vsftpd.chroot_list, but you may override this with the
.BR chroot_list_file
setting.


.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/vsftpd.banned_emails, but you may override this with the
.BR banned_email_file
setting.


If enabled, two log files are generated in parallel, going by default to
.BR /var/log/xferlog
and
.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.


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/vsftpd.email_passwords.

Default: NO
.TP

Default: YES
.TP
.B syslog_enable
If enabled, then any log output which would have gone to /var/log/vsftpd/vsftpd.log
goes to the system log instead. Logging is done under the FTPD facility.

Default: NO

.TP
.B xferlog_enable
If enabled, a log file will be maintained detailling uploads and downloads.
By default, this file will be placed at /var/log/vsftpd/vsftpd.log, but this location
may be overridden using the configuration setting
.BR vsftpd_log_file .


.BR deny_email_enable
is enabled.

Default: /etc/vsftpd/vsftpd.banned_emails
.TP
.B banner_file
This option is the name of a file containing text to display when someone

is enabled, then the list file becomes a list of users to NOT place in a
chroot() jail.

Default: /etc/vsftpd/vsftpd.chroot_list
.TP
.B cmds_allowed
This options specifies a comma separated list of allowed FTP commands (post

.BR secure_email_list_enable
setting.

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

This option specifies the location of the RSA certificate to use for SSL
encrypted connections.

Default: /etc/ssl/certs/vsftpd.pem
.TP
.B secure_chroot_dir
This option should be the name of a directory which is empty. Also, the
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/vsftpd/empty
.TP
.B ssl_ciphers
This option can be used to select which SSL ciphers vsftpd will allow for

with an example. If you set
.BR user_config_dir
to be
.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/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

.BR userlist_enable
option is active.

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

.BR syslog_enable ,
then this file is not written and output is sent to the system log instead.

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

Return to bug 60401

Lines 4-10 Link Here

(-)vsftpd-2.0.1/vsftpd.conf.5 (-16 / +16 lines)
4	.SH DESCRIPTION	4	.SH DESCRIPTION
5	vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By	5	vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
6	default, vsftpd looks for this file at the location	6	default, vsftpd looks for this file at the location
7	.BR /etc/vsftpd.conf .	7	.BR /etc/vsftpd/vsftpd.conf .
8	However, you may override this by specifying a command line argument to	8	However, you may override this by specifying a command line argument to
9	vsftpd. The command line argument is the pathname of the configuration file	9	vsftpd. The command line argument is the pathname of the configuration file
10	for vsftpd. This behaviour is useful because you may wish to use an advanced	10	for vsftpd. This behaviour is useful because you may wish to use an advanced
Lines 136-142 Link Here
136	different if chroot_local_user is set to YES. In this case, the list becomes	136	different if chroot_local_user is set to YES. In this case, the list becomes
137	a list of users which are NOT to be placed in a chroot() jail.	137	a list of users which are NOT to be placed in a chroot() jail.
138	By default, the file containing this list is	138	By default, the file containing this list is
139	/etc/vsftpd.chroot_list, but you may override this with the	139	/etc/vsftpd/vsftpd.chroot_list, but you may override this with the
140	.BR chroot_list_file	140	.BR chroot_list_file
141	setting.	141	setting.
142		142
Lines 164-170 Link Here
164	.B deny_email_enable	164	.B deny_email_enable
165	If activated, you may provide a list of anonymous password e-mail responses	165	If activated, you may provide a list of anonymous password e-mail responses
166	which cause login to be denied. By default, the file containing this list is	166	which cause login to be denied. By default, the file containing this list is
167	/etc/vsftpd.banned_emails, but you may override this with the	167	/etc/vsftpd/vsftpd.banned_emails, but you may override this with the
168	.BR banned_email_file	168	.BR banned_email_file
169	setting.	169	setting.
170		170
Lines 192-198 Link Here
192	If enabled, two log files are generated in parallel, going by default to	192	If enabled, two log files are generated in parallel, going by default to
193	.BR /var/log/xferlog	193	.BR /var/log/xferlog
194	and	194	and
195	.BR /var/log/vsftpd.log .	195	.BR /var/log/vsftpd/vsftpd.log .
196	The former is a wu-ftpd style transfer log, parseable by standard tools. The	196	The former is a wu-ftpd style transfer log, parseable by standard tools. The
197	latter is vsftpd's own style log.	197	latter is vsftpd's own style log.
198		198
Lines 355-361 Link Here
355	file specified by the	355	file specified by the
356	.BR email_password_file	356	.BR email_password_file
357	setting. The file format is one password per line, no extra whitespace. The	357	setting. The file format is one password per line, no extra whitespace. The
358	default filename is /etc/vsftpd.email_passwords.	358	default filename is /etc/vsftpd/vsftpd.email_passwords.
359		359
360	Default: NO	360	Default: NO
361	.TP	361	.TP
Lines 414-420 Link Here
414	Default: YES	414	Default: YES
415	.TP	415	.TP
416	.B syslog_enable	416	.B syslog_enable
417	If enabled, then any log output which would have gone to /var/log/vsftpd.log	417	If enabled, then any log output which would have gone to /var/log/vsftpd/vsftpd.log
418	goes to the system log instead. Logging is done under the FTPD facility.	418	goes to the system log instead. Logging is done under the FTPD facility.
419		419
420	Default: NO	420	Default: NO
Lines 494-500 Link Here
494	.TP	494	.TP
495	.B xferlog_enable	495	.B xferlog_enable
496	If enabled, a log file will be maintained detailling uploads and downloads.	496	If enabled, a log file will be maintained detailling uploads and downloads.
497	By default, this file will be placed at /var/log/vsftpd.log, but this location	497	By default, this file will be placed at /var/log/vsftpd/vsftpd.log, but this location
498	may be overridden using the configuration setting	498	may be overridden using the configuration setting
499	.BR vsftpd_log_file .	499	.BR vsftpd_log_file .
500		500
Lines 635-641 Link Here
635	.BR deny_email_enable	635	.BR deny_email_enable
636	is enabled.	636	is enabled.
637		637
638	Default: /etc/vsftpd.banned_emails	638	Default: /etc/vsftpd/vsftpd.banned_emails
639	.TP	639	.TP
640	.B banner_file	640	.B banner_file
641	This option is the name of a file containing text to display when someone	641	This option is the name of a file containing text to display when someone
Lines 664-670 Link Here
664	is enabled, then the list file becomes a list of users to NOT place in a	664	is enabled, then the list file becomes a list of users to NOT place in a
665	chroot() jail.	665	chroot() jail.
666		666
667	Default: /etc/vsftpd.chroot_list	667	Default: /etc/vsftpd/vsftpd.chroot_list
668	.TP	668	.TP
669	.B cmds_allowed	669	.B cmds_allowed
670	This options specifies a comma separated list of allowed FTP commands (post	670	This options specifies a comma separated list of allowed FTP commands (post
Lines 706-712 Link Here
706	.BR secure_email_list_enable	706	.BR secure_email_list_enable
707	setting.	707	setting.
708		708
709	Default: /etc/vsftpd.email_passwords	709	Default: /etc/vsftpd/vsftpd.email_passwords
710	.TP	710	.TP
711	.B ftp_username	711	.B ftp_username
712	This is the name of the user we use for handling anonymous FTP. The home	712	This is the name of the user we use for handling anonymous FTP. The home
Lines 791-804 Link Here
791	This option specifies the location of the RSA certificate to use for SSL	791	This option specifies the location of the RSA certificate to use for SSL
792	encrypted connections.	792	encrypted connections.
793		793
794	Default: /usr/share/ssl/certs/vsftpd.pem	794	Default: /etc/ssl/certs/vsftpd.pem
795	.TP	795	.TP
796	.B secure_chroot_dir	796	.B secure_chroot_dir
797	This option should be the name of a directory which is empty. Also, the	797	This option should be the name of a directory which is empty. Also, the
798	directory should not be writable by the ftp user. This directory is used	798	directory should not be writable by the ftp user. This directory is used
799	as a secure chroot() jail at times vsftpd does not require filesystem access.	799	as a secure chroot() jail at times vsftpd does not require filesystem access.
800		800
801	Default: /usr/share/empty	801	Default: /usr/share/vsftpd/empty
802	.TP	802	.TP
803	.B ssl_ciphers	803	.B ssl_ciphers
804	This option can be used to select which SSL ciphers vsftpd will allow for	804	This option can be used to select which SSL ciphers vsftpd will allow for
Lines 816-825 Link Here
816	with an example. If you set	816	with an example. If you set
817	.BR user_config_dir	817	.BR user_config_dir
818	to be	818	to be
819	.BR /etc/vsftpd_user_conf	819	.BR /etc/vsftpd/vsftpd_user_conf
820	and then log on as the user "chris", then vsftpd will apply the settings in	820	and then log on as the user "chris", then vsftpd will apply the settings in
821	the file	821	the file
822	.BR /etc/vsftpd_user_conf/chris	822	.BR /etc/vsftpd/vsftpd_user_conf/chris
823	for the duration of the session. The format of this file is as detailed in	823	for the duration of the session. The format of this file is as detailed in
824	this manual page! PLEASE NOTE that not all settings are effective on a	824	this manual page! PLEASE NOTE that not all settings are effective on a
825	per-user basis. For example, many settings only prior to the user's session	825	per-user basis. For example, many settings only prior to the user's session
Lines 855-861 Link Here
855	.BR userlist_enable	855	.BR userlist_enable
856	option is active.	856	option is active.
857		857
858	Default: /etc/vsftpd.user_list	858	Default: /etc/vsftpd/vsftpd.user_list
859	.TP	859	.TP
860	.B vsftpd_log_file	860	.B vsftpd_log_file
861	This option is the name of the file to which we write the vsftpd style	861	This option is the name of the file to which we write the vsftpd style
Lines 869-875 Link Here
869	.BR syslog_enable ,	869	.BR syslog_enable ,
870	then this file is not written and output is sent to the system log instead.	870	then this file is not written and output is sent to the system log instead.
871		871
872	Default: /var/log/vsftpd.log	872	Default: /var/log/vsftpd/vsftpd.log
873	.TP	873	.TP
874	.B xferlog_file	874	.B xferlog_file
875	This option is the name of the file to which we write the wu-ftpd style	875	This option is the name of the file to which we write the wu-ftpd style

Lines 87-105 Link Here

(-)vsftpd-2.0.1/tunables.c (-8 / +8 lines)
87	unsigned int tunable_max_per_ip = 0;	87	unsigned int tunable_max_per_ip = 0;
88	unsigned int tunable_trans_chunk_size = 0;	88	unsigned int tunable_trans_chunk_size = 0;
89		89
90	const char* tunable_secure_chroot_dir = "/usr/share/empty";	90	const char* tunable_secure_chroot_dir = "/usr/share/vsftpd/empty";
91	const char* tunable_ftp_username = "ftp";	91	const char* tunable_ftp_username = "ftp";
92	const char* tunable_chown_username = "root";	92	const char* tunable_chown_username = "root";
93	const char* tunable_xferlog_file = "/var/log/xferlog";	93	const char* tunable_xferlog_file = "/var/log/xferlog";
94	const char* tunable_vsftpd_log_file = "/var/log/vsftpd.log";	94	const char* tunable_vsftpd_log_file = "/var/log/vsftpd/vsftpd.log";
95	const char* tunable_message_file = ".message";	95	const char* tunable_message_file = ".message";
96	const char* tunable_nopriv_user = "nobody";	96	const char* tunable_nopriv_user = "nobody";
97	const char* tunable_ftpd_banner = 0;	97	const char* tunable_ftpd_banner = 0;
98	const char* tunable_banned_email_file = "/etc/vsftpd.banned_emails";	98	const char* tunable_banned_email_file = "/etc/vsftpd/vsftpd.banned_emails";
99	const char* tunable_chroot_list_file = "/etc/vsftpd.chroot_list";	99	const char* tunable_chroot_list_file = "/etc/vsftpd/vsftpd.chroot_list";
100	const char* tunable_pam_service_name = "ftp";	100	const char* tunable_pam_service_name = "vsftpd";
101	const char* tunable_guest_username = "ftp";	101	const char* tunable_guest_username = "ftp";
102	const char* tunable_userlist_file = "/etc/vsftpd.user_list";	102	const char* tunable_userlist_file = "/etc/vsftpd/vsftpd.user_list";
103	const char* tunable_anon_root = 0;	103	const char* tunable_anon_root = 0;
104	const char* tunable_local_root = 0;	104	const char* tunable_local_root = 0;
105	const char* tunable_banner_file = 0;	105	const char* tunable_banner_file = 0;
Lines 111-118 Link Here
111	const char* tunable_hide_file = 0;	111	const char* tunable_hide_file = 0;
112	const char* tunable_deny_file = 0;	112	const char* tunable_deny_file = 0;
113	const char* tunable_user_sub_token = 0;	113	const char* tunable_user_sub_token = 0;
114	const char* tunable_email_password_file = "/etc/vsftpd.email_passwords";	114	const char* tunable_email_password_file = "/etc/vsftpd/vsftpd.email_passwords";
115	const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem";	115	const char* tunable_rsa_cert_file = "/etc/ssl/certs/vsftpd.pem";
116	const char* tunable_dsa_cert_file = 0;	116	const char* tunable_dsa_cert_file = 0;
117	const char* tunable_ssl_ciphers = "DES-CBC3-SHA";	117	const char* tunable_ssl_ciphers = "DES-CBC3-SHA";
118		118