Renamed "Rendezvous" to "Zeroconf".

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index ab289fd5cf685ca2c04666ca2fdc1cca97cc13a7..7ef93175c0a3b9905f894675034837a211a1d35f 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.101 2005/06/24 19:20:56 fw Exp $";
+static char UNUSED id[] = "$Id: ngircd.c,v 1.104 2005/07/08 16:18:39 alex Exp $";
 
 /**
  * @file
@@ -48,7 +48,7 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.101 2005/06/24 19:20:56 fw Exp $";
 #include "parse.h"
 #include "irc.h"
 
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
 #include "rendezvous.h"
 #endif
 
@@ -259,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 )) {
@@ -269,11 +269,10 @@ main( int argc, const char *argv[] )
 
                /* Initialize modules, part II: these functions are eventually
                 * called with already dropped privileges ... */
-               Resolve_Init( );
                Lists_Init( );
                Channel_Init( );
                Client_Init( );
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
                Rendezvous_Init( );
 #endif
                Conn_Init( );
@@ -322,7 +321,7 @@ main( int argc, const char *argv[] )
 
                /* Alles abmelden */
                Conn_Exit( );
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
                Rendezvous_Exit( );
 #endif
                Client_Exit( );
@@ -362,11 +361,11 @@ Fill_Version( void )
 
        strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition );
 #endif
-#ifdef RENDEZVOUS
+#ifdef ZEROCONF
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
 
-       strlcat( NGIRCd_VersionAddition, "RENDEZVOUS", sizeof NGIRCd_VersionAddition );
+       strlcat( NGIRCd_VersionAddition, "ZEROCONF", sizeof NGIRCd_VersionAddition );
 #endif
 #ifdef IDENTAUTH
        if( NGIRCd_VersionAddition[0] )
@@ -742,8 +741,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;
-               Log_SetDaemonized();
                pid = (long)fork( );
                if( pid > 0 ) {
                        /* "Old" process: exit. */