Add the config handling code for expire_override_time config option.
Part one of override stuff. This is gonna be painful.
This commit is contained in:
parent
e2994faec6
commit
5974ba0c55
|
@ -510,6 +510,7 @@ general {
|
||||||
reject_duration = 5 minutes;
|
reject_duration = 5 minutes;
|
||||||
throttle_duration = 60;
|
throttle_duration = 60;
|
||||||
throttle_count = 4;
|
throttle_count = 4;
|
||||||
|
expire_override_time = 5 minutes;
|
||||||
};
|
};
|
||||||
|
|
||||||
modules {
|
modules {
|
||||||
|
|
|
@ -1260,6 +1260,12 @@ general {
|
||||||
/* throttle_count: Number of connections within throttle_duration that it takes
|
/* throttle_count: Number of connections within throttle_duration that it takes
|
||||||
* for throttling to take effect */
|
* for throttling to take effect */
|
||||||
throttle_count = 4;
|
throttle_count = 4;
|
||||||
|
|
||||||
|
/* expire_override_time: User mode +p (override) will be automatically unset
|
||||||
|
* this long after it is set. 0 disables this (not recommended). Default is
|
||||||
|
* 5 minutes.
|
||||||
|
*/
|
||||||
|
expire_override_time = 5 minutes;
|
||||||
};
|
};
|
||||||
|
|
||||||
modules {
|
modules {
|
||||||
|
|
|
@ -217,6 +217,7 @@ struct config_file_entry
|
||||||
int global_snotices;
|
int global_snotices;
|
||||||
int operspy_dont_care_user_info;
|
int operspy_dont_care_user_info;
|
||||||
int secret_channels_in_whois;
|
int secret_channels_in_whois;
|
||||||
|
int expire_override_time;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct config_channel_entry
|
struct config_channel_entry
|
||||||
|
|
|
@ -175,6 +175,12 @@ static struct InfoStruct info_table[] = {
|
||||||
&ConfigFileEntry.dots_in_ident,
|
&ConfigFileEntry.dots_in_ident,
|
||||||
"Number of permissable dots in an ident"
|
"Number of permissable dots in an ident"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"expire_override_time",
|
||||||
|
OUTPUT_DECIMAL,
|
||||||
|
&ConfigFileEntry.expire_override_time,
|
||||||
|
"Period of time after which to unset user mode +p"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"failed_oper_notice",
|
"failed_oper_notice",
|
||||||
OUTPUT_BOOLEAN,
|
OUTPUT_BOOLEAN,
|
||||||
|
|
|
@ -2199,6 +2199,7 @@ static struct ConfEntry conf_general_table[] =
|
||||||
{ "ts_warn_delta", CF_TIME, NULL, 0, &ConfigFileEntry.ts_warn_delta },
|
{ "ts_warn_delta", CF_TIME, NULL, 0, &ConfigFileEntry.ts_warn_delta },
|
||||||
{ "use_whois_actually", CF_YESNO, NULL, 0, &ConfigFileEntry.use_whois_actually },
|
{ "use_whois_actually", CF_YESNO, NULL, 0, &ConfigFileEntry.use_whois_actually },
|
||||||
{ "warn_no_nline", CF_YESNO, NULL, 0, &ConfigFileEntry.warn_no_nline },
|
{ "warn_no_nline", CF_YESNO, NULL, 0, &ConfigFileEntry.warn_no_nline },
|
||||||
|
{ "expire_override_time", CF_TIME, NULL, 0, &ConfigFileEntry.expire_override_time },
|
||||||
{ "\0", 0, NULL, 0, NULL }
|
{ "\0", 0, NULL, 0, NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -783,6 +783,7 @@ set_default_conf(void)
|
||||||
ConfigFileEntry.reject_duration = 120;
|
ConfigFileEntry.reject_duration = 120;
|
||||||
ConfigFileEntry.throttle_count = 4;
|
ConfigFileEntry.throttle_count = 4;
|
||||||
ConfigFileEntry.throttle_duration = 60;
|
ConfigFileEntry.throttle_duration = 60;
|
||||||
|
ConfigFileEntry.expire_override_time = 300;
|
||||||
|
|
||||||
ServerInfo.default_max_clients = MAXCONNECTIONS;
|
ServerInfo.default_max_clients = MAXCONNECTIONS;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue