X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=d9428ed4bacc3c4f028f0f8eac7e7252e0021e85;hb=ef3327d372c159bd2a395d6854843982a5e9c54d;hp=626b8b235245b21f43bf17749cb22d2b9182e5d1;hpb=33b1204349ed1d26564b562599414fa2718db276;p=ngircd-alex.git

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 626b8b23..d9428ed4 100644
--- 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;
@@ -166,14 +177,12 @@ main( int argc, const char *argv[] )
 			{
 				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 */
@@ -185,31 +194,38 @@ main( int argc, const char *argv[] )
 						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 );
@@ -352,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 );
@@ -450,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( );
 
@@ -577,8 +600,8 @@ Show_Help( void )
 	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 */
 
 
@@ -671,6 +694,19 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
 {
 	struct passwd *pwd;
 
+#ifdef __CYGWIN__
+	/* Cygwin kludge.
+	 * It can return EINVAL instead of EPERM
+	 * so, if we are already unprivileged,
+	 * use id of current user.
+	 */
+	if (geteuid() && getuid()) {
+		*uid = getuid();
+		*gid = getgid();
+		return true;
+	}
+#endif
+
 	pwd = getpwnam("nobody");
 	if (!pwd) return false;
 
@@ -698,6 +734,9 @@ 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 ));
@@ -766,7 +805,11 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
 		}
 
 		/* New child process */
+#ifndef NeXT
 		(void)setsid( );
+#else
+		setpgrp(0, getpid());
+#endif
 		chdir( "/" );
 
 		/* Detach stdin, stdout and stderr */