- Test auf POSIX Regular-Expression-Funktionen eingebaut.

[ngircd-alex.git] / src / ngircd / ngircd.c

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 4291c79f9d1a9ca53cb4778ef0923e2f06180358..ecc9d332a1a77675b5889497366e68c4c8b3d955 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: ngircd.c,v 1.36 2002/03/27 16:41:25 alex Exp $
+ * $Id: ngircd.c,v 1.44 2002/04/24 13:33:56 alex Exp $
  *
  * ngircd.c: Hier beginnt alles ;-)
  */
@@ -21,6 +21,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
@@ -76,6 +77,18 @@ GLOBAL int main( int argc, const char *argv[] )
                {
                        /* Lange Option */
 
+                       if( strcmp( argv[i], "--config" ) == 0 )
+                       {
+                               if( i + 1 < argc )
+                               {
+                                       /* Ok, danach kommt noch ein Parameter */
+                                       strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 );
+                                       NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
+
+                                       /* zum uebernaechsten Parameter */
+                                       i++; ok = TRUE;
+                               }
+                       }
                        if( strcmp( argv[i], "--configtest" ) == 0 )
                        {
                                configtest = TRUE;
@@ -131,6 +144,19 @@ GLOBAL int main( int argc, const char *argv[] )
                                        ok = TRUE;
                                }
 #endif
+                               if( argv[i][n] == 'f' )
+                               {
+                                       if(( ! argv[i][n + 1] ) && ( i + 1 < argc ))
+                                       {
+                                               /* Ok, danach kommt ein Leerzeichen */
+                                               strncpy( NGIRCd_ConfFile, argv[i + 1], FNAME_LEN - 1 );
+                                               NGIRCd_ConfFile[FNAME_LEN - 1] = '\0';
+
+                                               /* zum uebernaechsten Parameter */
+                                               i++; n = strlen( argv[i] );
+                                               ok = TRUE;
+                                       }
+                               }
                                if( argv[i][n] == 'n' )
                                {
                                        NGIRCd_NoDaemon = TRUE;
@@ -222,6 +248,25 @@ GLOBAL int main( int argc, const char *argv[] )
                Client_Init( );
                Conn_Init( );
 
+               /* Wenn als root ausgefuehrt und eine andere UID
+                * konfiguriert ist, jetzt zu dieser wechseln */
+               if( getuid( ) == 0 )
+               {
+                       if( Conf_GID != 0 )
+                       {
+                               /* Neue Group-ID setzen */
+                               if( setgid( Conf_GID ) != 0 ) Log( LOG_ERR, "Can't change Group-ID to %u: %s", Conf_GID, strerror( errno ));
+                       }
+                       if( Conf_UID != 0 )
+                       {
+                               /* Neue User-ID setzen */
+                               if( setuid( Conf_UID ) != 0 ) Log( LOG_ERR, "Can't change User-ID to %u: %s", Conf_UID, strerror( errno ));
+                       }
+               }
+               Log( LOG_INFO, "Running as user %ld, group %ld.", (INT32)getuid( ), (INT32)getgid( ));
+
+               Log_InitErrorfile( );
+
                /* Signal-Handler initialisieren */
                Initialize_Signal_Handler( );
 
@@ -243,11 +288,6 @@ GLOBAL int main( int argc, const char *argv[] )
                Log_Exit( );
        }
 
-#ifndef DEBUG
-       /* aufraeumen */
-       if( unlink( ERROR_FILE ) != 0 ) Log( LOG_ERR, "Can't delete \""ERROR_FILE"\": %s", strerror( errno ));
-#endif
-
        return 0;
 } /* main */
 
@@ -271,6 +311,10 @@ GLOBAL CHAR *NGIRCd_VersionAddition( VOID )
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "SYSLOG" );
 #endif
+#ifdef REGEX
+       if( txt[0] ) strcat( txt, "+" );
+       strcat( txt, "REGEX" );
+#endif
 #ifdef STRICT_RFC
        if( txt[0] ) strcat( txt, "+" );
        strcat( txt, "RFC" );
@@ -375,13 +419,13 @@ LOCAL VOID Initialize_Listen_Ports( VOID )
        /* Ports, auf denen der Server Verbindungen entgegennehmen
         * soll, initialisieren */
        
-       INT created, i;
+       UINT created, i;
 
        created = 0;
        for( i = 0; i < Conf_ListenPorts_Count; i++ )
        {
                if( Conn_NewListener( Conf_ListenPorts[i] )) created++;
-               else Log( LOG_ERR, "Can't listen on port %d!", Conf_ListenPorts[i] );
+               else Log( LOG_ERR, "Can't listen on port %u!", Conf_ListenPorts[i] );
        }
 
        if( created < 1 )
@@ -396,7 +440,8 @@ LOCAL VOID Initialize_Listen_Ports( VOID )
 LOCAL VOID Show_Version( VOID )
 {
        puts( NGIRCd_Version( ));
-       puts( "Copyright (c)2001,2002 by Alexander Barton (alex@barton.de).\n" );
+       puts( "Copyright (c)2001,2002 by Alexander Barton (<alex@barton.de>)." );
+       puts( "Homepage: <http://arthur.ath.cx/~alex/ngircd/>\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." );
 } /* Show_Version */
@@ -405,16 +450,17 @@ LOCAL VOID Show_Version( VOID )
 LOCAL VOID Show_Help( VOID )
 {
 #ifdef DEBUG
-       puts( "  -d, --debug       log extra debug messages" );
+       puts( "  -d, --debug        log extra debug messages" );
 #endif
-        puts( "  -n, --nodaemon    don't fork and don't detatch from controlling terminal" );
-        puts( "  -p, --passive     disable automatic connections to other servers" );
+       puts( "  -f, --config <f>   use file <f> as configuration file" );
+        puts( "  -n, --nodaemon     don't fork and don't detatch from controlling terminal" );
+        puts( "  -p, --passive      disable automatic connections to other servers" );
 #ifdef SNIFFER
-       puts( "  -s, --sniffer     enable network sniffer and display all IRC traffic" );
+       puts( "  -s, --sniffer      enable network sniffer and display all IRC traffic" );
 #endif
-       puts( "      --configtest  read, validate and display configuration; then exit" );
-       puts( "      --version     output version information and exit" );
-       puts( "      --help        display this help and exit" );
+       puts( "      --configtest   read, validate and display configuration; then exit" );
+       puts( "      --version      output version information and exit" );
+       puts( "      --help         display this help and exit" );
 } /* Show_Help */