]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/ngircd.c
Detect PAM libraries
[ngircd-alex.git] / src / ngircd / ngircd.c
index d2a6d7ea8faae860f0df893edef82969acf80a3b..ec42b2370a0deb858667a872610eee045eb4bbfb 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2007 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2010 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.117 2007/11/21 12:16:36 alex Exp $";
-
 /**
  * @file
  * The main program, including the C function main() which is called
@@ -36,13 +34,15 @@ static char UNUSED id[] = "$Id: ngircd.c,v 1.117 2007/11/21 12:16:36 alex Exp $"
 #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 "client.h"
+#include "conf-ssl.h"
 #include "channel.h"
 #include "conf.h"
-#include "cvs-version.h"
 #include "lists.h"
 #include "log.h"
 #include "parse.h"
@@ -87,6 +87,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;
@@ -102,14 +108,13 @@ main( int argc, const char *argv[] )
 
        Fill_Version( );
 
-       /* Kommandozeile parsen */
+       /* parse conmmand line */
        for( i = 1; i < argc; i++ )
        {
                ok = false;
                if(( argv[i][0] == '-' ) && ( argv[i][1] == '-' ))
                {
-                       /* Lange Option */
-
+                       /* long option */
                        if( strcmp( argv[i], "--config" ) == 0 )
                        {
                                if( i + 1 < argc )
@@ -164,19 +169,17 @@ main( int argc, const char *argv[] )
                }
                else if(( argv[i][0] == '-' ) && ( argv[i][1] != '-' ))
                {
-                       /* Kurze Option */
+                       /* short option */
                        for( n = 1; n < strlen( argv[i] ); n++ )
                        {
                                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 +191,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 );
@@ -228,7 +238,7 @@ main( int argc, const char *argv[] )
                }
        }
 
-       /* Debug-Level (fuer IRC-Befehl "VERSION") ermitteln */
+       /* Debug-Level (for IRCs "VERSION" command) */
        NGIRCd_DebugLevel[0] = '\0';
 #ifdef DEBUG
        if( NGIRCd_Debug ) strcpy( NGIRCd_DebugLevel, "1" );
@@ -241,7 +251,6 @@ main( int argc, const char *argv[] )
        }
 #endif
 
-       /* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */
        if( configtest )
        {
                Show_Version( ); puts( "" );
@@ -284,12 +293,13 @@ main( int argc, const char *argv[] )
                if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( );
 #endif
 
-               /* Signal-Handler initialisieren */
                Initialize_Signal_Handler( );
 
-               /* Protokoll- und Server-Identifikation erzeugen. Die vom ngIRCd
-                * beim PASS-Befehl verwendete Syntax sowie die erweiterten Flags
-                * sind in doc/Protocol.txt beschrieben. */
+               /*
+                * create protocol and server identification.
+                * The syntax used by ngIRCd in PASS commands and the extended flags
+                * are described in doc/Protocol.txt
+                */
 #ifdef IRCPLUS
                snprintf( NGIRCd_ProtoID, sizeof NGIRCd_ProtoID, "%s%s %s|%s:%s", PROTOVER, PROTOIRCPLUS, PACKAGE_NAME, PACKAGE_VERSION, IRCPLUSFLAGS );
 #ifdef ZLIB
@@ -303,12 +313,10 @@ main( int argc, const char *argv[] )
 #ifdef ZLIB
                strlcat( NGIRCd_ProtoID, "Z", sizeof NGIRCd_ProtoID );
 #endif
-               Log( LOG_DEBUG, "Protocol and server ID is \"%s\".", NGIRCd_ProtoID );
+               LogDebug("Protocol and server ID is \"%s\".", NGIRCd_ProtoID);
 
-               /* Vordefinierte Channels anlegen */
                Channel_InitPredefined( );
 
-               /* Listen-Ports initialisieren */
                if( Conn_InitListeners( ) < 1 )
                {
                        Log( LOG_ALERT, "Server isn't listening on a single port!" );
@@ -352,52 +360,57 @@ Fill_Version( void )
 #ifdef ZLIB
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
        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 );
-
        strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition );
 #endif
 #ifdef ZEROCONF
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
        strlcat( NGIRCd_VersionAddition, "ZEROCONF", sizeof NGIRCd_VersionAddition );
 #endif
 #ifdef IDENTAUTH
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
        strlcat( NGIRCd_VersionAddition, "IDENT", sizeof NGIRCd_VersionAddition );
 #endif
+#ifdef PAM
+       if (NGIRCd_VersionAddition[0])
+               strlcat(NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition);
+       strlcat(NGIRCd_VersionAddition, "PAM", sizeof NGIRCd_VersionAddition);
+#endif
 #ifdef DEBUG
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
        strlcat( NGIRCd_VersionAddition, "DEBUG", sizeof NGIRCd_VersionAddition );
 #endif
 #ifdef SNIFFER
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
        strlcat( NGIRCd_VersionAddition, "SNIFFER", sizeof NGIRCd_VersionAddition );
 #endif
 #ifdef STRICT_RFC
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
        strlcat( NGIRCd_VersionAddition, "RFC", sizeof NGIRCd_VersionAddition );
 #endif
 #ifdef IRCPLUS
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-
        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 ));
 
@@ -407,12 +420,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 */
 
 
 /**
@@ -427,15 +437,16 @@ NGIRCd_Rehash( void )
        Log( LOG_NOTICE|LOG_snotice, "Re-reading configuration NOW!" );
        NGIRCd_SignalRehash = false;
 
-       /* Close down all listening sockets */
-       Conn_ExitListeners( );
-
        /* 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;
+
+       /* Close down all listening sockets */
+       Conn_ExitListeners( );
 
        /* Recover old server name and nick name length: these values can't
         * be changed during run-time */
@@ -450,7 +461,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( );
 
@@ -467,15 +481,9 @@ NGIRCd_Rehash( void )
 static void
 Initialize_Signal_Handler( void )
 {
-       /* Signal-Handler initialisieren: einige Signale
-        * werden ignoriert, andere speziell behandelt. */
-
 #ifdef HAVE_SIGACTION
-       /* sigaction() ist vorhanden */
-
        struct sigaction saction;
 
-       /* Signal-Struktur initialisieren */
        memset( &saction, 0, sizeof( saction ));
        saction.sa_handler = Signal_Handler;
 #ifdef SA_RESTART
@@ -485,27 +493,22 @@ Initialize_Signal_Handler( void )
        saction.sa_flags |= SA_NOCLDWAIT;
 #endif
 
-       /* Signal-Handler einhaengen */
        sigaction(SIGINT, &saction, NULL);
        sigaction(SIGQUIT, &saction, NULL);
        sigaction(SIGTERM, &saction, NULL);
        sigaction(SIGHUP, &saction, NULL);
        sigaction(SIGCHLD, &saction, NULL);
 
-       /* einige Signale ignorieren */
+       /* we handle write errors properly; ignore SIGPIPE */
        saction.sa_handler = SIG_IGN;
        sigaction(SIGPIPE, &saction, NULL);
 #else
-       /* kein sigaction() vorhanden */
-
-       /* Signal-Handler einhaengen */
        signal(SIGINT, Signal_Handler);
        signal(SIGQUIT, Signal_Handler);
        signal(SIGTERM, Signal_Handler);
        signal(SIGHUP, Signal_Handler);
        signal(SIGCHLD, Signal_Handler);
 
-       /* einige Signale ignorieren */
        signal(SIGPIPE, SIG_IGN);
 #endif
 } /* Initialize_Signal_Handler */
@@ -525,16 +528,17 @@ Signal_Handler( int Signal )
                case SIGTERM:
                case SIGINT:
                case SIGQUIT:
-                       /* wir soll(t)en uns wohl beenden ... */
+                       /* shut down sever */
                        NGIRCd_SignalQuit = true;
                        break;
                case SIGHUP:
-                       /* Konfiguration neu einlesen: */
+                       /* re-read configuration */
                        NGIRCd_SignalRehash = true;
                        break;
                case SIGCHLD:
-                       /* Child-Prozess wurde beendet. Zombies vermeiden: */
-                       while( waitpid( -1, NULL, WNOHANG ) > 0);
+                       /* child-process exited, avoid zombies */
+                       while (waitpid( -1, NULL, WNOHANG) > 0)
+                               ;
                        break;
 #ifdef DEBUG
                default:
@@ -552,7 +556,7 @@ static void
 Show_Version( void )
 {
        puts( NGIRCd_Version );
-       puts( "Copyright (c)2001-2007 Alexander Barton (<alex@barton.de>) and Contributors." );
+       puts( "Copyright (c)2001-2010 Alexander Barton (<alex@barton.de>) and Contributors." );
        puts( "Homepage: <http://ngircd.barton.de/>\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." );
@@ -577,8 +581,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 +675,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 +715,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 ));
@@ -766,8 +787,14 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
                }
 
                /* New child process */
+#ifndef NeXT
                (void)setsid( );
-               chdir( "/" );
+#else
+               setpgrp(0, getpid());
+#endif
+               if (chdir( "/" ) != 0)
+                       Log(LOG_ERR, "Can't change directory to '/': %s",
+                                    strerror(errno));
 
                /* Detach stdin, stdout and stderr */
                Setup_FDStreams( );
@@ -784,16 +811,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) */