Backed out changeset 0d7b5f2ac591
This commit is contained in:
parent
5974ba0c55
commit
da3ba37e04
|
@ -510,7 +510,6 @@ general {
|
|||
reject_duration = 5 minutes;
|
||||
throttle_duration = 60;
|
||||
throttle_count = 4;
|
||||
expire_override_time = 5 minutes;
|
||||
};
|
||||
|
||||
modules {
|
||||
|
|
|
@ -1260,12 +1260,6 @@ general {
|
|||
/* throttle_count: Number of connections within throttle_duration that it takes
|
||||
* for throttling to take effect */
|
||||
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 {
|
||||
|
|
|
@ -217,7 +217,6 @@ struct config_file_entry
|
|||
int global_snotices;
|
||||
int operspy_dont_care_user_info;
|
||||
int secret_channels_in_whois;
|
||||
int expire_override_time;
|
||||
};
|
||||
|
||||
struct config_channel_entry
|
||||
|
|
|
@ -175,12 +175,6 @@ static struct InfoStruct info_table[] = {
|
|||
&ConfigFileEntry.dots_in_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",
|
||||
OUTPUT_BOOLEAN,
|
||||
|
|
|
@ -2199,7 +2199,6 @@ static struct ConfEntry conf_general_table[] =
|
|||
{ "ts_warn_delta", CF_TIME, NULL, 0, &ConfigFileEntry.ts_warn_delta },
|
||||
{ "use_whois_actually", CF_YESNO, NULL, 0, &ConfigFileEntry.use_whois_actually },
|
||||
{ "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 }
|
||||
};
|
||||
|
||||
|
|
|
@ -783,7 +783,6 @@ set_default_conf(void)
|
|||
ConfigFileEntry.reject_duration = 120;
|
||||
ConfigFileEntry.throttle_count = 4;
|
||||
ConfigFileEntry.throttle_duration = 60;
|
||||
ConfigFileEntry.expire_override_time = 300;
|
||||
|
||||
ServerInfo.default_max_clients = MAXCONNECTIONS;
|
||||
|
||||
|
|
Loading…
Reference in New Issue