X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/2b454b76dcea9b870fe373a6d010aec70ac63b70..07db71cda082d1d7db7bec491bb60aee5f1e2879:/src/ircd.c

diff --git a/src/ircd.c b/src/ircd.c
index 170ea9d..8716b3e 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -66,6 +66,8 @@
 #include "serno.h"
 #include "sslproc.h"
 #include "chmode.h"
+#include "privilege.h"
+#include "bandbi.h"
 
 /* /quote set variables */
 struct SetOptions GlobalSetOptions;
@@ -188,7 +190,7 @@ init_sys(void)
 		if(maxconnections <= MAX_BUFFER)
 		{
 			fprintf(stderr, "ERROR: Shell FD limits are too low.\n");
-			fprintf(stderr, "ERROR: ircd-ratbox reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
+			fprintf(stderr, "ERROR: charybdis reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
 			exit(EXIT_FAILURE);
 		}
 		return;
@@ -241,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,
@@ -330,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,
@@ -453,7 +457,7 @@ ircd_log_cb(const char *str)
 static void
 ircd_restart_cb(const char *str)
 {
-	inotice(L_MAIN, "libratbox has called the restart callback: %s", str);
+	inotice("libratbox has called the restart callback: %s", str);
 	restart(str);
 }
 
@@ -474,7 +478,7 @@ ircd_die_cb(const char *str)
 		inotice("libratbox has called the die callback..aborting: %s", str);
 	}
 	else
-		inotice(L_MAIN, "libratbox has called the die callback..aborting");
+		inotice("libratbox has called the die callback..aborting");
 
 	unlink(pidFileName);
 	exit(EXIT_FAILURE);
@@ -548,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 */
@@ -597,6 +597,7 @@ main(int argc, char *argv[])
 	if(printVersion)
 	{
 		printf("ircd: version %s(%s)\n", ircd_version, serno);
+		printf("ircd: %s\n", rb_lib_version());
 		exit(EXIT_SUCCESS);
 	}
 
@@ -625,6 +626,7 @@ main(int argc, char *argv[])
 		if(!server_state_foreground)
 			make_daemon();
 		inotice("starting %s ...", ircd_version);
+		inotice("%s", rb_lib_version());
 	}
 
 	/* Init the event subsystem */
@@ -637,6 +639,8 @@ main(int argc, char *argv[])
 	} else
 		rb_init_prng(NULL, RB_PRNG_DEFAULT);
 
+	seed_random(NULL);
+
 	init_main_logfile();
 	newconf_init();
 	init_s_conf();
@@ -654,25 +658,31 @@ 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);
 #endif
 	init_auth();		/* Initialise the auth code */
 	init_resolver();	/* Needs to be setup before the io loop */
+	privilegeset_set_new("default", "", 0);
 
 	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();
 
@@ -730,7 +740,6 @@ main(int argc, char *argv[])
 	rb_dlinkAddAlloc(&me, &global_serv_list);
 
 	construct_umodebuf();
-        construct_noparam_modes();
 
 	check_class();
 	write_pidfile(pidFileName);