X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/7b52cd51d5ec1d1ca0b6f1a79d99d7b4f0dd67aa..b869e117f01851f05ff6d02b65b2719e829057a7:/src/ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index 6a8a3d4..539a6c7 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -67,6 +67,7 @@
 #include "sslproc.h"
 #include "chmode.h"
 #include "privilege.h"
+#include "bandbi.h"
 
 /* /quote set variables */
 struct SetOptions GlobalSetOptions;
@@ -242,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,
@@ -549,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 */
@@ -670,15 +659,17 @@ 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); 
 	mod_add_path(MODULE_DIR "/autoload"); 
 #endif
 
+	init_bandb();
 	init_ssld();
 
+	rehash_bans(0);
+
 	initialize_server_capabs();	/* Set up default_server_capabs */
 	initialize_global_set_options();