netutils/vsftpd
1
0
Fork 0
mirror of https://github.com/InfrastructureServices/vsftpd.git synced 2025-04-19 01:24:02 +03:00
Code

Make the max number of bind retries tunable

Browse Source 
Resolves: rhbz#1318198
This commit is contained in:
Ondřej Lysoněk 2018-06-18 10:13:48 +02:00
parent 380e409306
commit be7c2d6391
5 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
parseconf.c
View File

@ -143,6 +143,7 @@ parseconf_uint_array[] =
{ "delay_successful_login", &tunable_delay_successful_login },
{ "max_login_fails", &tunable_max_login_fails },
{ "chown_upload_mode", &tunable_chown_upload_mode },
{ "bind_retries", &tunable_bind_retries },
{ 0, 0 }
};

8
privops.c
View File

@ -120,8 +120,8 @@ unsigned short
vsf_privop_pasv_listen(struct vsf_session* p_sess)
{
static struct vsf_sysutil_sockaddr* s_p_sockaddr;
int bind_retries = 10;
unsigned short the_port;
int bind_retries = tunable_bind_retries + 1;
unsigned short the_port = 0;
/* IPPORT_RESERVED */
unsigned short min_port = 1024;
unsigned short max_port = 65535;
@ -131,6 +131,10 @@ vsf_privop_pasv_listen(struct vsf_session* p_sess)
die("listed fd already active");
}
if (bind_retries < 2)
{
bind_retries = 2;
}
if (tunable_pasv_min_port > min_port && tunable_pasv_min_port <= max_port)
{
min_port = (unsigned short) tunable_pasv_min_port;

2
tunables.c
View File

@ -115,6 +115,7 @@ unsigned int tunable_delay_failed_login;
unsigned int tunable_delay_successful_login;
unsigned int tunable_max_login_fails;
unsigned int tunable_chown_upload_mode;
unsigned int tunable_bind_retries;
const char* tunable_secure_chroot_dir;
const char* tunable_ftp_username;
@ -268,6 +269,7 @@ tunables_load_defaults()
tunable_max_login_fails = 3;
/* -rw------- */
tunable_chown_upload_mode = 0600;
tunable_bind_retries = 9;
install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
install_str_setting("ftp", &tunable_ftp_username);

1
tunables.h
View File

@ -120,6 +120,7 @@ extern unsigned int tunable_delay_failed_login;
extern unsigned int tunable_delay_successful_login;
extern unsigned int tunable_max_login_fails;
extern unsigned int tunable_chown_upload_mode;
extern unsigned int tunable_bind_retries;
/* String defines */
extern const char* tunable_secure_chroot_dir;

5
vsftpd.conf.5
View File

@ -760,6 +760,11 @@ value will be treated as a base 10 integer!
Default: 077
.TP
.B bind_retries
Maximum number of attempts to find a free listening port in passive mode.
Default: 9
.TP
.B chown_upload_mode
The file mode to force for chown()ed anonymous uploads. (Added in v2.0.6).