Change formatting of some log messages

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

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 4cf4ff425af3192b8125d8af958915f7620e0f4d..1f7969df0aba32b8a83d1dc9394d99e70aa6b223 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -34,9 +34,14 @@
 #include <pwd.h>
 #include <grp.h>
 
+#if defined(DEBUG) && defined(HAVE_MTRACE)
+#include <mcheck.h>
+#endif
+
 #include "defines.h"
 #include "resolve.h"
 #include "conn.h"
+#include "conf-ssl.h"
 #include "client.h"
 #include "channel.h"
 #include "conf.h"
@@ -84,6 +89,12 @@ main( int argc, const char *argv[] )
        int i;
        size_t n;
 
+#if defined(DEBUG) && defined(HAVE_MTRACE)
+       /* enable GNU libc memory tracing when running in debug mode
+        * and functionality available */
+       mtrace();
+#endif
+
        umask( 0077 );
 
        NGIRCd_SignalQuit = NGIRCd_SignalRestart = NGIRCd_SignalRehash = false;
@@ -357,6 +368,10 @@ Fill_Version( void )
 
        strlcat( NGIRCd_VersionAddition, "ZLIB", sizeof NGIRCd_VersionAddition );
 #endif
+#ifdef SSL_SUPPORT
+       if ( NGIRCd_VersionAddition[0] ) strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
+       strlcat( NGIRCd_VersionAddition, "SSL", sizeof NGIRCd_VersionAddition );
+#endif
 #ifdef TCPWRAP
        if( NGIRCd_VersionAddition[0] )
                        strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
@@ -455,7 +470,10 @@ NGIRCd_Rehash( void )
 
        /* Create new pre-defined channels */
        Channel_InitPredefined( );
-       
+
+       if (!ConnSSL_InitLibrary())
+               Log(LOG_WARNING, "Re-Initializing SSL failed, using old keys");
+
        /* Start listening on sockets */
        Conn_InitListeners( );
 
@@ -716,6 +734,10 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
        if (initialized)
                return true;
 
+       if (!ConnSSL_InitLibrary())
+               Log(LOG_WARNING,
+                   "Warning: Error during SSL initialization, continuing ...");
+
        if( Conf_Chroot[0] ) {
                if( chdir( Conf_Chroot ) != 0 ) {
                        Log( LOG_ERR, "Can't chdir() in ChrootDir (%s): %s", Conf_Chroot, strerror( errno ));
@@ -784,7 +806,11 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
                }
 
                /* New child process */
+#ifndef NeXT
                (void)setsid( );
+#else
+               setpgrp(0, getpid());
+#endif
                chdir( "/" );
 
                /* Detach stdin, stdout and stderr */
@@ -806,12 +832,12 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
                                pwd ? pwd->pw_name : "unknown", Conf_UID,
                                grp ? grp->gr_name : "unknown", Conf_GID, pid);
 
-       if ( chrooted ) {
-               Log( LOG_INFO, "Running chrooted, chrootdir \"%s\".",  Conf_Chroot );
+       if (chrooted) {
+               Log(LOG_INFO, "Running with root directory \"%s\".",
+                   Conf_Chroot );
                return true;
-       } else {
-               Log( LOG_INFO, "Not running chrooted." );
-       }
+       } else
+               Log(LOG_INFO, "Not running with changed root directory.");
 
        /* Change working directory to home directory of the user
         * we are running as (only when running in daemon mode and not in chroot) */