Do not allow a topic change if a user may not send to the channel

[solanum.git] / src / ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index 8577081bffeb1ad2d7aa033796681288568c57ef..b5f8076ac3fc667635d5696bc2da9482eebb42ef 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.default_ident_timeout)
+               GlobalSetOptions.ident_timeout = ConfigFileEntry.default_ident_timeout;
+       else
+               GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
 
        rb_strlcpy(GlobalSetOptions.operstring,
                ConfigFileEntry.default_operstring,
@@ -649,13 +652,7 @@ main(int argc, char *argv[])
        init_monitor();
        init_isupport();
 
-       /* noparam core modes have to be initialized before the module
-        * system is initialized, otherwise we have a table collision.
-        *
-        * modules call this after they are done initializing...
-        *    --nenolod
-        */
-        construct_noparam_modes();
+        construct_cflags_strings();
 
        load_all_modules(1);
 #ifndef STATIC_MODULES