Get rid of Log_SetDaemonized().

[ngircd-alex.git] / src / ngircd / ngircd.c

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 674767769a77e8021610b65618f3632136d2f8e9..f435c712d9bda13b8aab013516da80e4db6979d1 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -12,7 +12,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: ngircd.c,v 1.98 2005/06/17 20:35:45 fw Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.102 2005/06/24 19:55:10 alex Exp $";
 
 /**
  * @file
@@ -83,13 +83,14 @@ GLOBAL int
 main( int argc, const char *argv[] )
 {
        bool ok, configtest = false;
+       bool NGIRCd_NoDaemon = false;
        int i;
        size_t n;
 
        umask( 0077 );
 
        NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = false;
-       NGIRCd_NoDaemon = NGIRCd_Passive = false;
+       NGIRCd_Passive = false;
 #ifdef DEBUG
        NGIRCd_Debug = false;
 #endif
@@ -258,7 +259,7 @@ main( int argc, const char *argv[] )
                NGIRCd_SignalQuit = false;
 
                /* Initialize modules, part I */
-               Log_Init( );
+               Log_Init( ! NGIRCd_NoDaemon );
                Conf_Init( );
 
                if (!NGIRCd_Init( NGIRCd_NoDaemon )) {
@@ -741,7 +742,6 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
         * connected to ther controlling terminal. Use "--nodaemon"
         * to disable this "daemon mode" (useful for debugging). */
        if ( ! NGIRCd_NoDaemon ) {
-               initialized = true;
                pid = (long)fork( );
                if( pid > 0 ) {
                        /* "Old" process: exit. */
@@ -789,12 +789,14 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
        /* Change working directory to home directory of the user
         * we are running as (only when running in daemon mode and not in chroot) */
        
-       if ( pwd && !NGIRCd_NoDaemon ) {
-               if( chdir( pwd->pw_dir ) == 0 ) 
-                       Log( LOG_DEBUG, "Changed working directory to \"%s\" ...", pwd->pw_dir );
-               else 
-                       Log( LOG_ERR, "Can't change working directory to \"%s\": %s",
-                                                       pwd->pw_dir, strerror( errno ));
+       if ( pwd ) {
+               if (!NGIRCd_NoDaemon ) {
+                       if( chdir( pwd->pw_dir ) == 0 ) 
+                               Log( LOG_DEBUG, "Changed working directory to \"%s\" ...", pwd->pw_dir );
+                       else 
+                               Log( LOG_ERR, "Can't change working directory to \"%s\": %s",
+                                                               pwd->pw_dir, strerror( errno ));
+               }
        } else {
                Log( LOG_ERR, "Can't get user informaton for UID %d!?", Conf_UID );
        }