2004-05-09 Michael Poole <mdpoole@troilus.org>

[ircu2.10.12-pk.git] / ircd / ircd.c

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 5888513a7b965406965457d9533caf4b67322276..065487c61cd10d62cadf7427e758f9c0eb8812f6 100644 (file)
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -308,7 +308,7 @@ static void try_connections(struct Event* ev) {
       (*pconf = con_conf)->next = 0;
     }
 
-    if (connect_server(con_conf, 0, 0))
+    if (connect_server(con_conf, 0))
       sendto_opmask_butone(0, SNO_OLDSNO, "Connection to %s activated.",
                           con_conf->name);
   }
@@ -633,10 +633,6 @@ int main(int argc, char **argv) {
   setup_signals();
   feature_init(); /* initialize features... */
   log_init(*argv);
-  if (check_pid()) {
-    Debug((DEBUG_FATAL, "Failed to acquire PID file lock after fork"));
-    exit(2);
-  }
   set_nomem_handler(outofmemory);
   
   if (!init_string()) {
@@ -662,6 +658,11 @@ int main(int argc, char **argv) {
     return 7;
   }
 
+  if (check_pid()) {
+    Debug((DEBUG_FATAL, "Failed to acquire PID file lock after fork"));
+    exit(2);
+  }
+
   init_server_identity();
 
   uping_init();