X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/0c23c0b1c526193bac9efb4decee564b2db16b0a..6ac21a70e238ca31704f4a5be3a3b71af2c2d2d0:/ircd/ircd.c

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 4e5093fc..935aa4e9 100644
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -1,5 +1,5 @@
 /*
- *  charybdis: A slightly useful ircd.
+ *  Solanum: a slightly advanced ircd
  *  ircd.c: Starts up and runs the ircd.
  *
  *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
@@ -206,7 +206,7 @@ init_sys(void)
 		if(maxconnections <= MAX_BUFFER)
 		{
 			fprintf(stderr, "ERROR: Shell FD limits are too low.\n");
-			fprintf(stderr, "ERROR: charybdis reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
+			fprintf(stderr, "ERROR: solanum reserves %d FDs, shell limits must be above this\n", MAX_BUFFER);
 			exit(EXIT_FAILURE);
 		}
 		return;
@@ -553,7 +553,7 @@ ircd_restart_cb(const char *str)
 /*
  * Why EXIT_FAILURE here?
  * Because if ircd_die_cb() is called it's because of a fatal
- * error inside libcharybdis, and we don't know how to handle the
+ * error inside libsolanum, and we don't know how to handle the
  * exception, so it is logical to return a FAILURE exit code here.
  *    --nenolod
  */
@@ -627,7 +627,7 @@ seed_random(void *unused)
  * Side Effects - this is where the ircd gets going right now
  */
 int
-charybdis_main(int argc, char * const argv[])
+solanum_main(int argc, char * const argv[])
 {
 	int fd;
 
@@ -679,6 +679,7 @@ charybdis_main(int argc, char * const argv[])
 	me.localClient = &meLocalUser;
 
 	/* Make sure all lists are zeroed */
+	memset(&global_client_list, 0, sizeof(global_client_list));
 	memset(&unknown_list, 0, sizeof(unknown_list));
 	memset(&lclient_list, 0, sizeof(lclient_list));
 	memset(&serv_list, 0, sizeof(serv_list));
@@ -724,8 +725,14 @@ charybdis_main(int argc, char * const argv[])
 	if(!testing_conf)
 	{
 		check_pidfile(pidFileName);
+
 		inotice("starting %s ...", ircd_version);
 		inotice("%s", rb_lib_version());
+
+#ifndef _WIN32
+		if(!server_state_foreground)
+			make_daemon();
+#endif
 	}
 
 	/* Init the event subsystem */
@@ -817,13 +824,6 @@ charybdis_main(int argc, char * const argv[])
 			ircd_ssl_ok = true;
 	}
 
-	if (testing_conf)
-	{
-		fprintf(stderr, "\nConfig testing complete.\n");
-		fflush(stderr);
-		return 0;	/* Why? We want the launcher to exit out. */
-	}
-
 	me.from = &me;
 	me.servptr = &me;
 	SetMe(&me);
@@ -837,7 +837,15 @@ charybdis_main(int argc, char * const argv[])
 
 	construct_umodebuf();
 
+	if (testing_conf)
+	{
+		fprintf(stderr, "\nConfig testing complete.\n");
+		fflush(stderr);
+		return 0;	/* Why? We want the launcher to exit out. */
+	}
+
 	check_class();
+	write_pidfile(pidFileName);
 	load_help();
 	open_logfiles();
 
@@ -861,12 +869,6 @@ charybdis_main(int argc, char * const argv[])
 	if(server_state_foreground)
 		inotice("now running in foreground mode from %s as pid %d ...",
 		        ConfigFileEntry.dpath, getpid());
-#ifndef _WIN32
-	else
-		make_daemon();
-#endif
-
-	write_pidfile(pidFileName);
 
 	rb_lib_loop(0);