X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=b56429531c6dede4636c72b8ec2c1c91cfdc200b;hp=5b872fc52a309b498f58935001d1dd040b42e803;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hpb=a0efcdccfa9689c1c845986a44a74c9d218a65bc diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 5b872fc5..b5642953 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -34,13 +34,17 @@ #include #include +#if defined(DEBUG) && defined(HAVE_MTRACE) +#include +#endif + #include "defines.h" #include "resolve.h" #include "conn.h" +#include "conf-ssl.h" #include "client.h" #include "channel.h" #include "conf.h" -#include "cvs-version.h" #include "lists.h" #include "log.h" #include "parse.h" @@ -85,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; @@ -167,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 */ @@ -186,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 ); @@ -353,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 ); @@ -410,12 +429,9 @@ Fill_Version( void ) strlcat( NGIRCd_VersionAddition, "/", sizeof( NGIRCd_VersionAddition )); strlcat( NGIRCd_VersionAddition, TARGET_OS, sizeof( NGIRCd_VersionAddition )); -#ifdef CVSDATE - snprintf( NGIRCd_Version, sizeof NGIRCd_Version,"%s %s(%s)-%s", PACKAGE_NAME, PACKAGE_VERSION, CVSDATE, NGIRCd_VersionAddition); -#else - snprintf( NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition); -#endif -} /* Fill_Version */ + snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s", + PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition); + } /* Fill_Version */ /** @@ -454,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( ); @@ -581,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 */ @@ -675,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; @@ -702,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 )); @@ -770,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 */ @@ -788,16 +828,16 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) pwd = getpwuid( Conf_UID ); grp = getgrgid( Conf_GID ); - Log( LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", - pwd ? pwd->pw_name : "unknown", Conf_UID, - grp ? grp->gr_name : "unknown", Conf_GID, pid); + Log(LOG_INFO, "Running as user %s(%ld), group %s(%ld), with PID %ld.", + pwd ? pwd->pw_name : "unknown", (long)Conf_UID, + grp ? grp->gr_name : "unknown", (long)Conf_GID, (long)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) */