Add a configuration option for ident_timeout.

diff --git a/TODO-SHADOW b/TODO-SHADOW
index c99443d2928d34a0a79096b265c98659236aeb19..447dc22905ae8443a1af03d3c5a91b00fe51ac9b 100644 (file)
--- a/TODO-SHADOW
+++ b/TODO-SHADOW
@@ -12,4 +12,3 @@ 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
-* Add a configuration option to set the ident_timeout time.

diff --git a/doc/example.conf b/doc/example.conf
index d2153aea72e6744727b30131ddbaaec9033d7d7e..a12c951f04b39333668593e0bfda1b2e75222284 100755 (executable)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -551,6 +551,7 @@ general {
        short_motd = no;
        ping_cookie = no;
        connect_timeout = 30 seconds;
+       ident_timeout = 5;
        disable_auth = no;
        no_oper_flood = yes;
        true_no_oper_flood = no;

diff --git a/doc/reference.conf b/doc/reference.conf
index 2cdc13f4d3dd94e36de7dbf61004df913b3cd207..03fe6689912aed513d1041ce8705b86446476340 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1298,6 +1298,11 @@ general {
         */
        connect_timeout = 30 seconds;
 
+       /* ident timeout: Amount of time (in seconds) that the IRCd will
+        * wait for a user to respond to an ident request.
+        */
+       ident_timeout = 5;
+
        /* disable auth: disables identd checking */
        disable_auth = no;
 

diff --git a/include/s_conf.h b/include/s_conf.h
index d9e3b1fe0fd55224350c0823e64ce0e1eabfc525..d4cc947fbc07a6218f8104c0503f0edea1b1af77 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -212,6 +212,7 @@ struct config_file_entry
        int min_nonwildcard_simple;
        int default_floodcount;
        int client_flood;
+       int ident_timeout;
        int use_egd;
        int ping_cookie;
        int tkline_expire_notices;

diff --git a/modules/m_info.c b/modules/m_info.c
index e8291271aa19d09fe3521e228ccca2b938210add..428e354d0434d7ecd777736435b1e8820f9352d0 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -139,6 +139,12 @@ static struct InfoStruct info_table[] = {
                &ConfigFileEntry.connect_timeout,
                "Connect timeout for connections to servers"
        },
+       {
+               "ident_timeout",
+               OUTPUT_DECIMAL,
+               &ConfigFileEntry.ident_timeout,
+               "Amount of time the server waits for ident responses from clients",
+       },
        {
                "default_floodcount",
                OUTPUT_DECIMAL,

diff --git a/src/ircd.c b/src/ircd.c
index a9f6cfbd1ef4cf2446d609b78f4d6051da981746..add5f65b81403c9f226e24237883aa502e59de0f 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -324,7 +324,10 @@ initialize_global_set_options(void)
                splitchecking = 1;
        }
 
-       GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
+       if(ConfigFileEntry.ident_timeout)
+               GlobalSetOptions.ident_timeout = ConfigFileEntry.ident_timeout;
+       else
+               GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
 
        rb_strlcpy(GlobalSetOptions.operstring,
                ConfigFileEntry.default_operstring,

diff --git a/src/newconf.c b/src/newconf.c
index 08f22ac538678fa8dc8d61499cdc98b6671b96ea..10ac5de1676d62fc6438310480c456403ef57b91 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -2214,6 +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         },
        { "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  },

diff --git a/src/s_conf.c b/src/s_conf.c
index c1d623475f35a92739fc5624d610ce4e54d145b7..a138e3e314a676bc2da62bce244840ad99a41c02 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -806,6 +806,7 @@ set_default_conf(void)
        ConfigFileEntry.min_nonwildcard = 4;
        ConfigFileEntry.min_nonwildcard_simple = 3;
        ConfigFileEntry.default_floodcount = 8;
+       ConfigFileEntry.ident_timeout = 5;
        ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
        ConfigFileEntry.tkline_expire_notices = 0;