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

Remove unused kline_delay config option

Browse source
This commit is contained in:
Ed Kellett 2019-04-27 14:53:04 +01:00
parent 9834d3d5ba
commit 6ca9ff0ea1
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
6 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/ircd.conf.example
View file

@ -579,7 +579,6 @@ general {
resv_fnc = yes; resv_fnc = yes;
global_snotices = yes; global_snotices = yes;
dline_with_reason = yes; dline_with_reason = yes;
kline_delay = 0 seconds;
kline_with_reason = yes; kline_with_reason = yes;
kline_reason = "K-Lined"; kline_reason = "K-Lined";
identify_service = "NickServ@services.int"; identify_service = "NickServ@services.int";

6
doc/reference.conf
View file

@ -1173,12 +1173,6 @@ general {
*/ */
dline_with_reason = yes; dline_with_reason = yes;
/* kline delay: delay the checking of klines until a specified time.
* Useful if large kline lists are applied often to prevent the
* server eating CPU.
*/
kline_delay = 0 seconds;
/* kline reason: show the user the reason why they are k/dlined /* kline reason: show the user the reason why they are k/dlined
* on exit. may give away who set k/dline when set via tcm. * on exit. may give away who set k/dline when set via tcm.
*/ */

1
include/s_conf.h
View file

@ -178,7 +178,6 @@ struct config_file_entry
int ts_warn_delta; int ts_warn_delta;
int dline_with_reason; int dline_with_reason;
int kline_with_reason; int kline_with_reason;
int kline_delay;
int warn_no_nline; int warn_no_nline;
int nick_delay; int nick_delay;
int non_redundant_klines; int non_redundant_klines;

10
ircd/newconf.c
View file

@ -1616,15 +1616,6 @@ conf_set_general_hide_error_messages(void *data)
conf_report_error("Invalid setting '%s' for general::hide_error_messages.", val); conf_report_error("Invalid setting '%s' for general::hide_error_messages.", val);
} }
static void
conf_set_general_kline_delay(void *data)
{
ConfigFileEntry.kline_delay = *(unsigned int *) data;
/* THIS MUST BE HERE to stop us being unable to check klines */
kline_queued = false;
}
static void static void
conf_set_general_stats_k_oper_only(void *data) conf_set_general_stats_k_oper_only(void *data)
{ {
@ -2732,7 +2723,6 @@ static struct ConfEntry conf_general_table[] =
{ "compression_level", CF_INT, conf_set_general_compression_level, 0, NULL }, { "compression_level", CF_INT, conf_set_general_compression_level, 0, NULL },
{ "havent_read_conf", CF_YESNO, conf_set_general_havent_read_conf, 0, NULL }, { "havent_read_conf", CF_YESNO, conf_set_general_havent_read_conf, 0, NULL },
{ "hide_error_messages",CF_STRING, conf_set_general_hide_error_messages,0, NULL }, { "hide_error_messages",CF_STRING, conf_set_general_hide_error_messages,0, NULL },
{ "kline_delay", CF_TIME, conf_set_general_kline_delay, 0, NULL },
{ "stats_k_oper_only", CF_STRING, conf_set_general_stats_k_oper_only, 0, NULL }, { "stats_k_oper_only", CF_STRING, conf_set_general_stats_k_oper_only, 0, NULL },
{ "stats_i_oper_only", CF_STRING, conf_set_general_stats_i_oper_only, 0, NULL }, { "stats_i_oper_only", CF_STRING, conf_set_general_stats_i_oper_only, 0, NULL },
{ "default_umodes", CF_QSTRING, conf_set_general_default_umodes, 0, NULL }, { "default_umodes", CF_QSTRING, conf_set_general_default_umodes, 0, NULL },

1
ircd/s_conf.c
View file

@ -707,7 +707,6 @@ set_default_conf(void)
ConfigFileEntry.client_exit = true; ConfigFileEntry.client_exit = true;
ConfigFileEntry.dline_with_reason = true; ConfigFileEntry.dline_with_reason = true;
ConfigFileEntry.kline_with_reason = true; ConfigFileEntry.kline_with_reason = true;
ConfigFileEntry.kline_delay = 0;
ConfigFileEntry.warn_no_nline = true; ConfigFileEntry.warn_no_nline = true;
ConfigFileEntry.non_redundant_klines = true; ConfigFileEntry.non_redundant_klines = true;
ConfigFileEntry.stats_e_disabled = false; ConfigFileEntry.stats_e_disabled = false;

6
modules/m_info.c
View file

@ -284,12 +284,6 @@ static struct InfoStruct info_table[] = {
&ConfigFileEntry.hide_spoof_ips, &ConfigFileEntry.hide_spoof_ips,
"Hide IPs of spoofed users" "Hide IPs of spoofed users"
}, },
{
"kline_delay",
OUTPUT_DECIMAL,
&ConfigFileEntry.kline_delay,
"Duration of time to delay kline checking"
},
{ {
"kline_reason", "kline_reason",
OUTPUT_STRING, OUTPUT_STRING,