Add me_svsjoin function to allow services to "force"join clients

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

diff --git a/src/ircd.c b/src/ircd.c
index 962c7edc23ec9b908b2a58a0da532b62d463af1e..8577081bffeb1ad2d7aa033796681288568c57ef 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,
@@ -550,10 +542,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 +648,15 @@ main(int argc, char *argv[])
        init_cache();
        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();
+
        load_all_modules(1);
 #ifndef STATIC_MODULES
        load_core_modules(1);
@@ -739,7 +736,6 @@ main(int argc, char *argv[])
        rb_dlinkAddAlloc(&me, &global_serv_list);
 
        construct_umodebuf();
-        construct_noparam_modes();
 
        check_class();
        write_pidfile(pidFileName);