Remove unused kline_delay config option

diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example
index bfd91714dc76cdc1c55b1064208590fb2445ff41..bd2379469af385677241f06d97749ffa74b5dcda 100644 (file)
--- a/doc/ircd.conf.example
+++ b/doc/ircd.conf.example
@@ -579,7 +579,6 @@ general {
        resv_fnc = yes;
        global_snotices = yes;
        dline_with_reason = yes;
-       kline_delay = 0 seconds;
        kline_with_reason = yes;
        kline_reason = "K-Lined";
        identify_service = "NickServ@services.int";

diff --git a/doc/reference.conf b/doc/reference.conf
index c174abeec8f507375113fd39b89e147f01874cb6..ae6060ad8bc7aaa6daa0db99deadfa3dfb93ad9f 100644 (file)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1173,12 +1173,6 @@ general {
         */
        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
         * on exit.  may give away who set k/dline when set via tcm.
         */

diff --git a/include/s_conf.h b/include/s_conf.h
index 0faa1bce0f321b493ffafa8c510f034b51a50477..9744eb928050650684dc4c9bff6bfe88ac6b6744 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -178,7 +178,6 @@ struct config_file_entry
        int ts_warn_delta;
        int dline_with_reason;
        int kline_with_reason;
-       int kline_delay;
        int warn_no_nline;
        int nick_delay;
        int non_redundant_klines;

diff --git a/ircd/newconf.c b/ircd/newconf.c
index d8b528aaa895783b38b86f82309d565b43abd24c..a1988545115120eb361634b108d7986df43db981 100644 (file)
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -1616,15 +1616,6 @@ conf_set_general_hide_error_messages(void *data)
                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
 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 },
        { "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 },
-       { "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_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 },

diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 329129cbbb8c7300f24b7243df4a85d9070b4482..a828c1aa9e78c12faccbdf7df36b80107bd8b3af 100644 (file)
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -707,7 +707,6 @@ set_default_conf(void)
        ConfigFileEntry.client_exit = true;
        ConfigFileEntry.dline_with_reason = true;
        ConfigFileEntry.kline_with_reason = true;
-       ConfigFileEntry.kline_delay = 0;
        ConfigFileEntry.warn_no_nline = true;
        ConfigFileEntry.non_redundant_klines = true;
        ConfigFileEntry.stats_e_disabled = false;

diff --git a/modules/m_info.c b/modules/m_info.c
index 81d69a969244ab3949fd77f89bbc6aa559d3ecfa..0f08d04dd421abc5af8cf4e1624b6402da037322 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -284,12 +284,6 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.hide_spoof_ips,
                "Hide IPs of spoofed users"
        },
-       {
-               "kline_delay",
-               OUTPUT_DECIMAL,
-               &ConfigFileEntry.kline_delay,
-               "Duration of time to delay kline checking"
-       },
        {
                "kline_reason",
                OUTPUT_STRING,