Fix VERSION and RPL_MYINFO to only show modes that are enabled. Also fix up some...

[irc/rqf/shadowircd.git] / src / ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index 5f4cfc6ca31ba24cdb92060358d65f3c74e7f12e..8716b3e99a5a59635b0418a3244f4c4774f59f19 100644 (file)
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -243,16 +243,8 @@ make_daemon(void)
 static int printVersion = 0;
 
 struct lgetopt myopts[] = {
-       {"dlinefile", &ConfigFileEntry.dlinefile,
-        STRING, "File to use for dlines.conf"},
        {"configfile", &ConfigFileEntry.configfile,
         STRING, "File to use for ircd.conf"},
-       {"klinefile", &ConfigFileEntry.klinefile,
-        STRING, "File to use for kline.conf"},
-       {"xlinefile", &ConfigFileEntry.xlinefile,
-        STRING, "File to use for xline.conf"},
-       {"resvfile", &ConfigFileEntry.resvfile,
-        STRING, "File to use for resv.conf"},
        {"logfile", &logFileName,
         STRING, "File to use for ircd.log"},
        {"pidfile", &pidFileName,
@@ -332,7 +324,17 @@ 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;
+
+       if(ConfigFileEntry.default_operhost)
+               rb_strlcpy(GlobalSetOptions.operhost,
+                       ConfigFileEntry.default_operhost,
+                       sizeof(GlobalSetOptions.operhost));
+       else
+               rb_strlcpy(GlobalSetOptions.operhost, "", sizeof(GlobalSetOptions.operhost));
 
        rb_strlcpy(GlobalSetOptions.operstring,
                ConfigFileEntry.default_operstring,
@@ -550,10 +552,6 @@ main(int argc, char *argv[])
 
        ConfigFileEntry.dpath = DPATH;
        ConfigFileEntry.configfile = CPATH;     /* Server configuration file */
-       ConfigFileEntry.klinefile = KPATH;      /* Server kline file */
-       ConfigFileEntry.dlinefile = DLPATH;     /* dline file */
-       ConfigFileEntry.xlinefile = XPATH;
-       ConfigFileEntry.resvfile = RESVPATH;
        ConfigFileEntry.connect_timeout = 30;   /* Default to 30 */
        
        umask(077);             /* better safe than sorry --SRB */
@@ -660,6 +658,9 @@ main(int argc, char *argv[])
        init_cache();
        init_monitor();
        init_isupport();
+
+        construct_cflags_strings();
+
        load_all_modules(1);
 #ifndef STATIC_MODULES
        load_core_modules(1);
@@ -671,7 +672,6 @@ main(int argc, char *argv[])
        if (testing_conf)
                fprintf(stderr, "\nBeginning config test\n");
        read_conf_files(YES);   /* cold start init conf files */
-       rehash_bans(0);
 #ifndef STATIC_MODULES
 
        mod_add_path(MODULE_DIR); 
@@ -681,6 +681,8 @@ main(int argc, char *argv[])
        init_bandb();
        init_ssld();
 
+       rehash_bans(0);
+
        initialize_server_capabs();     /* Set up default_server_capabs */
        initialize_global_set_options();
 
@@ -738,7 +740,6 @@ main(int argc, char *argv[])
        rb_dlinkAddAlloc(&me, &global_serv_list);
 
        construct_umodebuf();
-        construct_noparam_modes();
 
        check_class();
        write_pidfile(pidFileName);