X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=d9428ed4bacc3c4f028f0f8eac7e7252e0021e85;hp=b3ab7c416dff10917d6ade9395af0541248708dd;hb=3243d9ee441e9cd4338965bac7c2ed3b49a3c2dd;hpb=47e581e453a2df8b132ef28c1b89ed9152a54a1e diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index b3ab7c41..d9428ed4 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2006 Alexander Barton (alex@barton.de). + * Copyright (c)2001-2008 Alexander Barton (alex@barton.de). * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -12,8 +12,6 @@ #include "portab.h" -static char UNUSED id[] = "$Id: ngircd.c,v 1.113 2006/07/23 12:07:33 alex Exp $"; - /** * @file * The main program, including the C function main() which is called @@ -36,13 +34,17 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.113 2006/07/23 12:07:33 alex Exp $" #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" @@ -87,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; @@ -169,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 */ @@ -188,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 ); @@ -271,7 +284,6 @@ main( int argc, const char *argv[] ) /* Initialize modules, part II: these functions are eventually * called with already dropped privileges ... */ - Lists_Init( ); Channel_Init( ); Client_Init( ); #ifdef ZEROCONF @@ -328,7 +340,6 @@ main( int argc, const char *argv[] ) #endif Client_Exit( ); Channel_Exit( ); - Lists_Exit( ); Log_Exit( ); } Pidfile_Delete( ); @@ -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 ); @@ -399,7 +414,12 @@ Fill_Version( void ) strlcat( NGIRCd_VersionAddition, "IRCPLUS", sizeof NGIRCd_VersionAddition ); #endif +#ifdef WANT_IPV6 + if (NGIRCd_VersionAddition[0]) + strlcat(NGIRCd_VersionAddition, "+", sizeof(NGIRCd_VersionAddition)); + strlcat(NGIRCd_VersionAddition, "IPv6", sizeof(NGIRCd_VersionAddition)); +#endif if( NGIRCd_VersionAddition[0] ) strlcat( NGIRCd_VersionAddition, "-", sizeof( NGIRCd_VersionAddition )); @@ -409,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 */ /** @@ -424,29 +441,39 @@ GLOBAL void NGIRCd_Rehash( void ) { char old_name[CLIENT_ID_LEN]; + unsigned old_nicklen; Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" ); NGIRCd_SignalRehash = false; - /* Close down all listening sockets */ - Conn_ExitListeners( ); - - /* Remember old server name */ + /* Remember old server name and nick name length */ strlcpy( old_name, Conf_ServerName, sizeof old_name ); + old_nicklen = Conf_MaxNickLength; /* Re-read configuration ... */ - Conf_Rehash( ); + if (!Conf_Rehash( )) + return; - /* Recover old server name: it can't be changed during run-time */ - if( strcmp( old_name, Conf_ServerName ) != 0 ) - { - strlcpy( Conf_ServerName, old_name, sizeof Conf_ServerName ); - Log( LOG_ERR, "Can't change \"ServerName\" on runtime! Ignored new name." ); + /* Close down all listening sockets */ + Conn_ExitListeners( ); + + /* Recover old server name and nick name length: these values can't + * be changed during run-time */ + if (strcmp(old_name, Conf_ServerName) != 0 ) { + strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName); + Log(LOG_ERR, "Can't change \"ServerName\" on runtime! Ignored new name."); + } + if (old_nicklen != Conf_MaxNickLength) { + Conf_MaxNickLength = old_nicklen; + Log(LOG_ERR, "Can't change \"MaxNickLength\" on runtime! Ignored new value."); } /* 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( ); @@ -548,7 +575,7 @@ static void Show_Version( void ) { puts( NGIRCd_Version ); - puts( "Copyright (c)2001-2006 Alexander Barton () and Contributors." ); + puts( "Copyright (c)2001-2008 Alexander Barton () and Contributors." ); puts( "Homepage: \n" ); puts( "This is free software; see the source for copying conditions. There is NO" ); puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ); @@ -573,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 */ @@ -667,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; @@ -694,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 )); @@ -762,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 */ @@ -799,7 +846,7 @@ NGIRCd_Init( bool NGIRCd_NoDaemon ) if( chdir( pwd->pw_dir ) == 0 ) Log( LOG_DEBUG, "Changed working directory to \"%s\" ...", pwd->pw_dir ); else - Log( LOG_ERR, "Can't change working directory to \"%s\": %s", + Log( LOG_INFO, "Notice: Can't change working directory to \"%s\": %s", pwd->pw_dir, strerror( errno )); } } else {