X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fngircd.c;h=78ffd9a00f029d5e84b3feafd4d7cdd84f53fb99;hp=b78bed3aff06648d1db6f066699006edcd613d51;hb=75c0bd250eeb4c5347d3d2fc1524936f472fcda0;hpb=ca33cbda05902b0009058d369f88c0a7a43b1bbe diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index b78bed3a..78ffd9a0 100644 --- 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.32 2002/03/12 14:37:52 alex Exp $ + * $Id: ngircd.c,v 1.43 2002/04/04 13:03:55 alex Exp $ * * ngircd.c: Hier beginnt alles ;-) */ @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -50,10 +51,11 @@ LOCAL VOID Show_Version( VOID ); LOCAL VOID Show_Help( VOID ); -GLOBAL INT main( INT argc, CONST CHAR *argv[] ) +GLOBAL int main( int argc, const char *argv[] ) { - BOOLEAN ok; - INT pid, i, n; + BOOLEAN ok, configtest = FALSE; + INT32 pid, n; + INT i; NGIRCd_Restart = FALSE; NGIRCd_Quit = FALSE; @@ -65,6 +67,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) #ifdef SNIFFER NGIRCd_Sniffer = FALSE; #endif + strcpy( NGIRCd_ConfFile, CONFIG_FILE ); /* Kommandozeile parsen */ for( i = 1; i < argc; i++ ) @@ -74,6 +77,23 @@ 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; + ok = TRUE; + } #ifdef DEBUG if( strcmp( argv[i], "--debug" ) == 0 ) { @@ -83,8 +103,8 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) #endif if( strcmp( argv[i], "--help" ) == 0 ) { - Show_Version( ); puts( "" ); - Show_Help( ); puts( "" ); + Show_Version( ); + puts( "" ); Show_Help( ); puts( "" ); exit( 1 ); } if( strcmp( argv[i], "--nodaemon" ) == 0 ) @@ -114,7 +134,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) { /* Kurze Option */ - for( n = 1; n < strlen( argv[i] ); n++ ) + for( n = 1; n < (INT32)strlen( argv[i] ); n++ ) { ok = FALSE; #ifdef DEBUG @@ -124,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; @@ -167,6 +200,13 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) #ifdef SNIFFER if( NGIRCd_Sniffer ) strcpy( NGIRCd_DebugLevel, "2" ); #endif + + /* Soll nur die Konfigurations ueberprueft und ausgegeben werden? */ + if( configtest ) + { + Show_Version( ); puts( "" ); + exit( Conf_Test( )); + } while( ! NGIRCd_Quit ) { @@ -177,7 +217,7 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) if( ! NGIRCd_NoDaemon ) { /* Daemon im Hintergrund erzeugen */ - pid = fork( ); + pid = (INT32)fork( ); if( pid > 0 ) { /* "alter" Prozess */ @@ -191,13 +231,13 @@ GLOBAL INT main( INT argc, CONST CHAR *argv[] ) } /* Child-Prozess initialisieren */ - setsid( ); + (VOID)setsid( ); chdir( "/" ); } /* Globale Variablen initialisieren */ NGIRCd_Start = time( NULL ); - strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start )); + (VOID)strftime( NGIRCd_StartStr, 64, "%a %b %d %Y at %H:%M:%S (%Z)", localtime( &NGIRCd_Start )); NGIRCd_Restart = FALSE; NGIRCd_Quit = FALSE; @@ -208,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( ); @@ -229,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,7 +325,7 @@ GLOBAL CHAR *NGIRCd_VersionAddition( VOID ) #endif if( txt[0] ) strcat( txt, "-" ); - strcat( txt, P_OSNAME"/"P_ARCHNAME ); + strcat( txt, TARGET_CPU"/"TARGET_VENDOR"/"TARGET_OS ); return txt; } /* NGIRCd_VersionAddition */ @@ -361,13 +415,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 ) @@ -382,7 +436,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 ()." ); + 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." ); } /* Show_Version */ @@ -390,21 +445,18 @@ LOCAL VOID Show_Version( VOID ) LOCAL VOID Show_Help( VOID ) { - puts( "Compile-time defaults:\n" ); - puts( " - configuration: "CONFIG_FILE ); - puts( " - MOTD file: "MOTD_FILE ); - puts( " - server error log: "ERROR_FILE"\n" ); - puts( "Run-time options:\n" ); #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 use file 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( " --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 */