9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change config option for ident_timeout to default_ident_timeout as jilles

Browse source 
recommended.
This commit is contained in:
JD Horelick 2010-04-05 16:29:11 -04:00
parent 0ffb810660
commit 944b0584ea
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/example.conf
View file

@ -475,7 +475,7 @@ general {
short_motd = no; short_motd = no;
ping_cookie = no; ping_cookie = no;
connect_timeout = 30 seconds; connect_timeout = 30 seconds;
ident_timeout = 5; default_ident_timeout = 5;
disable_auth = no; disable_auth = no;
no_oper_flood = yes; no_oper_flood = yes;
max_targets = 4; max_targets = 4;

2
doc/reference.conf
View file

@ -1119,7 +1119,7 @@ general {
/* ident timeout: Amount of time (in seconds) that the IRCd will /* ident timeout: Amount of time (in seconds) that the IRCd will
* wait for a user to respond to an ident request. * wait for a user to respond to an ident request.
*/ */
ident_timeout = 5; default_ident_timeout = 5;
/* disable auth: disables identd checking */ /* disable auth: disables identd checking */
disable_auth = no; disable_auth = no;

2
include/s_conf.h
View file

@ -206,7 +206,7 @@ struct config_file_entry
int min_nonwildcard_simple; int min_nonwildcard_simple;
int default_floodcount; int default_floodcount;
int client_flood; int client_flood;
int ident_timeout; int default_ident_timeout;
int use_egd; int use_egd;
int ping_cookie; int ping_cookie;
int tkline_expire_notices; int tkline_expire_notices;

4
modules/m_info.c
View file

@ -134,9 +134,9 @@ static struct InfoStruct info_table[] = {
"Connect timeout for connections to servers" "Connect timeout for connections to servers"
}, },
{ {
"ident_timeout", "default_ident_timeout",
OUTPUT_DECIMAL, OUTPUT_DECIMAL,
&ConfigFileEntry.ident_timeout, &ConfigFileEntry.default_ident_timeout,
"Amount of time the server waits for ident responses from clients", "Amount of time the server waits for ident responses from clients",
}, },
{ {

4
src/ircd.c
View file

@ -324,8 +324,8 @@ initialize_global_set_options(void)
splitchecking = 1; splitchecking = 1;
} }
if(ConfigFileEntry.ident_timeout) if(ConfigFileEntry.default_ident_timeout)
GlobalSetOptions.ident_timeout = ConfigFileEntry.ident_timeout; GlobalSetOptions.ident_timeout = ConfigFileEntry.default_ident_timeout;
else else
GlobalSetOptions.ident_timeout = IDENT_TIMEOUT; GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;

2
src/newconf.c
View file

@ -2136,7 +2136,7 @@ static struct ConfEntry conf_general_table[] =
{ "collision_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc }, { "collision_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc },
{ "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout }, { "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout },
{ "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount }, { "default_floodcount", CF_INT, NULL, 0, &ConfigFileEntry.default_floodcount },
{ "ident_timeout", CF_INT, NULL, 0, &ConfigFileEntry.ident_timeout }, { "default_ident_timeout", CF_INT, NULL, 0, &ConfigFileEntry.default_ident_timeout },
{ "disable_auth", CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth }, { "disable_auth", CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth },
{ "dots_in_ident", CF_INT, NULL, 0, &ConfigFileEntry.dots_in_ident }, { "dots_in_ident", CF_INT, NULL, 0, &ConfigFileEntry.dots_in_ident },
{ "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice }, { "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice },

2
src/s_conf.c
View file

@ -782,7 +782,7 @@ set_default_conf(void)
ConfigFileEntry.min_nonwildcard = 4; ConfigFileEntry.min_nonwildcard = 4;
ConfigFileEntry.min_nonwildcard_simple = 3; ConfigFileEntry.min_nonwildcard_simple = 3;
ConfigFileEntry.default_floodcount = 8; ConfigFileEntry.default_floodcount = 8;
ConfigFileEntry.ident_timeout = 5; ConfigFileEntry.default_ident_timeout = 5;
ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT; ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
ConfigFileEntry.tkline_expire_notices = 0; ConfigFileEntry.tkline_expire_notices = 0;