Change kicknorejoin to be hardcoded to 2 seconds instead of a

configurable opton.

diff --git a/NEWS b/NEWS
index bfd88dedce7a41784754d5df8cd3d9178471003e..7655692efc428fc7620a1685caa0f16e77c794e0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
-This is ShadowIRCd 6.1, Copyright (c) 2005-2010 ShadowIRCd team.
+This is ShadowIRCd 6.2, Copyright (c) 2005-2010 ShadowIRCd team.
 See LICENSE for licensing details (GPL v2).
 
+-- shadowircd-6.2.0
+
+other changes
+- change kicknorejoin to not be a config option and be hardcoded to 2 seconds
+  because a longer time is kind of pointless.
+
 -- shadowircd-6.1.0
 
 new configuration options

diff --git a/doc/example.conf b/doc/example.conf
index 8ea9132a6ea9f8fbb3b5bab6c8b2ff91a75dd700..0131d15e6b9f7506aaeadfdafe4486e35b5be392 100755 (executable)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -396,7 +396,6 @@ channel {
        cycle_host_change = yes;
        host_in_topic = yes;
        resv_forcepart = yes;
-       kick_no_rejoin_time = 30 seconds;
 };
 
 serverhide {

diff --git a/doc/reference.conf b/doc/reference.conf
index 81c09422fb224f257ce0f89ba09901c96075da1f..d6b4647b335ea83165ab883d0402d2a64e1ef406 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -892,11 +892,6 @@ channel {
         * when a RESV is issued.
         */
        resv_forcepart = yes;
-
-       /* kick_no_rejoin_time: the amount of time that a user cannot
-        * rejoin for after being kicked out of a +J channel.
-        */
-       kick_no_rejoin_time = 30 seconds;
 };
 
 

diff --git a/include/s_conf.h b/include/s_conf.h
index 50f403dce90d58fcab4fcd94f92b24757eb8e82b..465ee84e871a3ad12b2fce489a51d7e114ae20ba 100644 (file)
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -261,7 +261,6 @@ struct config_channel_entry
        int cycle_host_change;
        int host_in_topic;
        int resv_forcepart;
-       int kick_no_rejoin_time;
 
        int exempt_cmode_c;
        int exempt_cmode_C;

diff --git a/modules/m_info.c b/modules/m_info.c
index 0efc69dc0bd7c531fea2f020480ea5080f667cde..dbc013ab76d6107c019e95bd0fbf2e3b323ca3e4 100644 (file)
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -668,12 +668,6 @@ static struct InfoStruct info_table[] = {
                &ConfigChannel.resv_forcepart,
                "Force-part local users on channel RESV"
        },
-       {
-               "kick_no_rejoin_time",
-               OUTPUT_DECIMAL,
-               &ConfigChannel.kick_no_rejoin_time,
-               "The amount of time that a user cannot rejoin a +J channel for after being kicked."
-       },
        {
                "disable_hidden",
                OUTPUT_BOOLEAN_YN,

diff --git a/src/channel.c b/src/channel.c
index 74767f4d57880f3a08064a2e5c15cb237c7cede8..f30a069a6861437ce36a577313d1944800aaed19 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -861,10 +861,10 @@ can_join(struct Client *source_p, struct Channel *chptr, char *key)
 
        DICTIONARY_FOREACH(md, &iter, chptr->metadata)
        {
-               if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time()))
+               if(!strcmp(md->value, "KICKNOREJOIN") && !strcmp(md->name, text) && (md->timevalue + 2 > rb_current_time()))
                        return ERR_KICKNOREJOIN;
                /* cleanup any stale KICKNOREJOIN metadata we find while we're at it */
-               if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + ConfigChannel.kick_no_rejoin_time > rb_current_time()))  
+               if(!strcmp(md->value, "KICKNOREJOIN") && !(md->timevalue + 2 > rb_current_time()))  
                        channel_metadata_delete(chptr, md->name, 0);
        }
 

diff --git a/src/newconf.c b/src/newconf.c
index 6321d4031285047ca89d497909efe378f56d0b23..477b40a93f70f34bbd070974909d9eadf8688996 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -2287,7 +2287,6 @@ static struct ConfEntry conf_channel_table[] =
        { "use_forward",        CF_YESNO, NULL, 0, &ConfigChannel.use_forward           },
        { "use_local_channels", CF_YESNO, NULL, 0, &ConfigChannel.use_local_channels    },
        { "resv_forcepart",     CF_YESNO, NULL, 0, &ConfigChannel.resv_forcepart        },
-       { "kick_no_rejoin_time", CF_TIME,  NULL, 0, &ConfigChannel.kick_no_rejoin_time  },
        { "exempt_cmode_c",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_c        },
        { "exempt_cmode_C",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_C        },
        { "exempt_cmode_D",     CF_YESNO, NULL, 0, &ConfigChannel.exempt_cmode_D        },

diff --git a/src/s_conf.c b/src/s_conf.c
index b03a1305e2d94463f3a4a40796bad09f3f89c6a3..8818a02bc9ce77702e64aaee84121cfc280f839e 100644 (file)
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -788,7 +788,6 @@ set_default_conf(void)
        ConfigChannel.no_join_on_split = NO;
        ConfigChannel.no_create_on_split = YES;
        ConfigChannel.resv_forcepart = YES;
-       ConfigChannel.kick_no_rejoin_time = 30;
 
        ConfigChannel.exempt_cmode_c = NO;
        ConfigChannel.exempt_cmode_C = NO;