Change config option for ident_timeout to default_ident_timeout as jilles

recommended. Also update the TODO. Also, cocks.

diff --git a/TODO-SHADOW b/TODO-SHADOW
index 447dc22905ae8443a1af03d3c5a91b00fe51ac9b..0c312775eb83e563d7f3c580a6b3456a3821f5aa 100644 (file)
--- a/TODO-SHADOW
+++ b/TODO-SHADOW
@@ -1,8 +1,6 @@
 Todo list for ShadowIRCd 6.1
 -----------------------------
 * notice/message !#channel and %#channel
-* Add a disable_oper option to auth {} to not allow users in that auth block
-  to use OPER.
 * Add default_operhost to /set
 
 Todo list for ShadowIRCd 6.2
@@ -12,3 +10,4 @@ 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
+* implementation to change other users' umodes (if you're a oper of course)

diff --git a/doc/example.conf b/doc/example.conf
index a12c951f04b39333668593e0bfda1b2e75222284..8ea9132a6ea9f8fbb3b5bab6c8b2ff91a75dd700 100755 (executable)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -551,7 +551,7 @@ general {
        short_motd = no;
        ping_cookie = no;
        connect_timeout = 30 seconds;
-       ident_timeout = 5;
+       default_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 03fe6689912aed513d1041ce8705b86446476340..fe082d77e7afb8ed61371e09528af9923b3e249e 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1301,7 +1301,7 @@ general {
        /* ident timeout: Amount of time (in seconds) that the IRCd will
         * wait for a user to respond to an ident request.
         */
-       ident_timeout = 5;
+       default_ident_timeout = 5;
 
        /* disable auth: disables identd checking */
        disable_auth = no;

diff --git a/include/s_conf.h b/include/s_conf.h
index d4cc947fbc07a6218f8104c0503f0edea1b1af77..50f403dce90d58fcab4fcd94f92b24757eb8e82b 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -212,7 +212,7 @@ struct config_file_entry
        int min_nonwildcard_simple;
        int default_floodcount;
        int client_flood;
-       int ident_timeout;
+       int default_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 428e354d0434d7ecd777736435b1e8820f9352d0..0efc69dc0bd7c531fea2f020480ea5080f667cde 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -140,9 +140,9 @@ static struct InfoStruct info_table[] = {
                "Connect timeout for connections to servers"
        },
        {
-               "ident_timeout",
+               "default_ident_timeout",
                OUTPUT_DECIMAL,
-               &ConfigFileEntry.ident_timeout,
+               &ConfigFileEntry.default_ident_timeout,
                "Amount of time the server waits for ident responses from clients",
        },
        {

diff --git a/src/ircd.c b/src/ircd.c
index add5f65b81403c9f226e24237883aa502e59de0f..b5f8076ac3fc667635d5696bc2da9482eebb42ef 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -324,8 +324,8 @@ initialize_global_set_options(void)
                splitchecking = 1;
        }
 
-       if(ConfigFileEntry.ident_timeout)
-               GlobalSetOptions.ident_timeout = ConfigFileEntry.ident_timeout;
+       if(ConfigFileEntry.default_ident_timeout)
+               GlobalSetOptions.ident_timeout = ConfigFileEntry.default_ident_timeout;
        else
                GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
 

diff --git a/src/newconf.c b/src/newconf.c
index 10ac5de1676d62fc6438310480c456403ef57b91..6321d4031285047ca89d497909efe378f56d0b23 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -2214,7 +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         },
+       { "default_ident_timeout",      CF_INT, NULL, 0, &ConfigFileEntry.default_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 a138e3e314a676bc2da62bce244840ad99a41c02..de8695f5bcf440242da2b6f2a2e925c1cfcf9fb7 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -806,7 +806,7 @@ set_default_conf(void)
        ConfigFileEntry.min_nonwildcard = 4;
        ConfigFileEntry.min_nonwildcard_simple = 3;
        ConfigFileEntry.default_floodcount = 8;
-       ConfigFileEntry.ident_timeout = 5;
+       ConfigFileEntry.default_ident_timeout = 5;
        ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
        ConfigFileEntry.tkline_expire_notices = 0;