#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"
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;
{
ok = false;
#ifdef DEBUG
- if( argv[i][n] == 'd' )
- {
+ if (argv[i][n] == 'd') {
NGIRCd_Debug = true;
ok = true;
}
#endif
- if( argv[i][n] == 'f' )
- {
+ if (argv[i][n] == 'f') {
if(( ! argv[i][n + 1] ) && ( i + 1 < argc ))
{
/* Ok, next character is a blank */
ok = true;
}
}
- if( argv[i][n] == 'n' )
- {
+
+ if (argv[i][n] == 'h') {
+ Show_Version();
+ puts(""); Show_Help(); puts("");
+ exit(1);
+ }
+
+ if (argv[i][n] == 'n') {
NGIRCd_NoDaemon = true;
ok = true;
}
- if( argv[i][n] == 'p' )
- {
+ if (argv[i][n] == 'p') {
NGIRCd_Passive = true;
ok = true;
}
#ifdef SNIFFER
- if( argv[i][n] == 's' )
- {
+ if (argv[i][n] == 's') {
NGIRCd_Sniffer = true;
ok = true;
}
#endif
- if( argv[i][n] == 't' )
- {
+ if (argv[i][n] == 't') {
configtest = true;
ok = true;
}
- if( ! ok )
- {
+ if (argv[i][n] == 'V') {
+ Show_Version();
+ exit(1);
+ }
+
+ if (! ok) {
printf( "%s: invalid option \"-%c\"!\n", PACKAGE_NAME, argv[i][n] );
printf( "Try \"%s --help\" for more information.\n", PACKAGE_NAME );
exit( 1 );
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 );
/* 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( );
puts( " -s, --sniffer enable network sniffer and display all IRC traffic" );
#endif
puts( " -t, --configtest read, validate and display configuration; then exit" );
- puts( " --version output version information and exit" );
- puts( " --help display this help and exit" );
+ puts( " -V, --version output version information and exit" );
+ puts( " -h, --help display this help and exit" );
} /* Show_Help */
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 ));
}
/* New child process */
+#ifndef NeXT
(void)setsid( );
+#else
+ setpgrp(0, getpid());
+#endif
chdir( "/" );
/* Detach stdin, stdout and stderr */