Committer  : isomer
CVSROOT    : /cvsroot/undernet-ircu
Module     : ircu2.10
Branch tags: u2_10_11_07
Commit time: 2004-03-19 23:36:27 UTC

Modified files:
  Tag: u2_10_11_07
     ChangeLog ircd/ircd.c

Log message:

Author: Entrope <[EMAIL PROTECTED]>
Log message:

        * ircd/ircd.c: Move the PID file acquisition after reading
        the config file, so that F:PPATH works.

---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.130.2.4 ircu2.10/ChangeLog:1.290.2.130.2.5
--- ircu2.10/ChangeLog:1.290.2.130.2.4  Fri Mar 19 15:23:36 2004
+++ ircu2.10/ChangeLog  Fri Mar 19 15:36:17 2004
@@ -1,4 +1,8 @@
 2004-02-27  Entrope <[EMAIL PROTECTED]>
+        * ircd/ircd.c: Move the PID file acquisition after reading
+        the config file, so that F:PPATH works.
+
+2004-02-27  Entrope <[EMAIL PROTECTED]>
 
         * doc/readme.who: Describe the support for matching on and
         showing account names.
Index: ircu2.10/ircd/ircd.c
diff -u ircu2.10/ircd/ircd.c:1.51.2.11 ircu2.10/ircd/ircd.c:1.51.2.11.4.1
--- ircu2.10/ircd/ircd.c:1.51.2.11      Sat Nov  1 02:19:10 2003
+++ ircu2.10/ircd/ircd.c        Fri Mar 19 15:36:17 2004
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: ircd.c,v 1.51.2.11 2003/11/01 10:19:10 isomer Exp $
+ * $Id: ircd.c,v 1.51.2.11.4.1 2004/03/19 23:36:17 isomer Exp $
  */
 #include "config.h"
 
@@ -634,10 +634,6 @@
   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()) {
@@ -663,6 +659,11 @@
     return 7;
   }
 
+  if (check_pid()) {
+    Debug((DEBUG_FATAL, "Failed to acquire PID file lock after fork"));
+    exit(2);
+  }
+
   init_server_identity();
 
   uping_init();
----------------------- End of diff -----------------------

Reply via email to