cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change config option for ident_timeout to default_ident_timeout as jilles 

recommended. Also update the TODO. Also, cocks.
This commit is contained in:
JD Horelick 2010-04-05 16:29:11 -04:00
parent e50ed244f4
commit 1434082803
8 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO-SHADOW
View File

@ -1,8 +1,6 @@
Todo list for ShadowIRCd 6.1
-----------------------------
* notice/message !#channel and %#channel
* Add a disable_oper option to auth {} to not allow users in that auth block
to use OPER.
* Add default_operhost to /set
Todo list for ShadowIRCd 6.2
@ -12,3 +10,4 @@ Todo list for ShadowIRCd 6.2
* pure TS6 compat mode for linking with charybdis/ratbox/etc.
* TBAN equivalent (like a extban?) (?)
* ELINE - command to make users kline/dline/xline exempt on-the-fly
* implementation to change other users' umodes (if you're a oper of course)

2
doc/example.conf
View File

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

2
doc/reference.conf
View File

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

2
include/s_conf.h
View File

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

4
modules/m_info.c
View File

@ -140,9 +140,9 @@ static struct InfoStruct info_table[] = {
"Connect timeout for connections to servers"
},
{
"ident_timeout",
"default_ident_timeout",
OUTPUT_DECIMAL,
&ConfigFileEntry.ident_timeout,
&ConfigFileEntry.default_ident_timeout,
"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;
}
if(ConfigFileEntry.ident_timeout)
GlobalSetOptions.ident_timeout = ConfigFileEntry.ident_timeout;
if(ConfigFileEntry.default_ident_timeout)
GlobalSetOptions.ident_timeout = ConfigFileEntry.default_ident_timeout;
else
GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;

2
src/newconf.c
View File

@ -2214,7 +2214,7 @@ static struct ConfEntry conf_general_table[] =
{ "collision_fnc", CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc },
{ "connect_timeout", CF_TIME, NULL, 0, &ConfigFileEntry.connect_timeout },
{ "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 },
{ "dots_in_ident", CF_INT, NULL, 0, &ConfigFileEntry.dots_in_ident },
{ "failed_oper_notice", CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice },

2
src/s_conf.c
View File

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