X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=5fdac5fff225a8165f1f600b87f22e03180c48f0;hp=4a4fe216c6e365128b91335b4871fd5f4a4089fd;hb=6725d7893ca62007ba828b9d8eb94e81f275a880;hpb=c2f60abe55b5a8d320a27df0ce41790fa1141081 diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 4a4fe216..5fdac5ff 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1,22 +1,21 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001,2002 Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: conf.c,v 1.26 2002/05/27 13:09:26 alex Exp $ - * - * conf.h: Konfiguration des ngircd + * Configuration management (reading, parsing & validation) */ #include "portab.h" +static char UNUSED id[] = "$Id: conf.c,v 1.42 2002/12/12 11:26:08 alex Exp $"; + #include "imp.h" #include #include @@ -25,6 +24,13 @@ #include #include #include +#include +#include +#include + +#ifdef HAVE_CTYPE_H +# include +#endif #include "ngircd.h" #include "conn.h" @@ -65,17 +71,18 @@ Conf_Init( VOID ) GLOBAL INT Conf_Test( VOID ) { - /* Konfiguration einlesen, ueberpruefen und ausgeben. */ + /* Read configuration, validate and output it. */ - UINT i; + struct passwd *pwd; + struct group *grp; + INT i; Use_Log = FALSE; Set_Defaults( ); - printf( "Using \"%s\" as configuration file ...\n", NGIRCd_ConfFile ); Read_Config( ); - /* Wenn stdin ein ein TTY ist: auf Taste warten */ + /* If stdin is a valid tty wait for a key: */ if( isatty( fileno( stdout ))) { puts( "OK, press enter to see a dump of your service configuration ..." ); @@ -87,26 +94,36 @@ Conf_Test( VOID ) printf( " ServerName = %s\n", Conf_ServerName ); printf( " ServerInfo = %s\n", Conf_ServerInfo ); printf( " ServerPwd = %s\n", Conf_ServerPwd ); + printf( " AdminInfo1 = %s\n", Conf_ServerAdmin1 ); + printf( " AdminInfo2 = %s\n", Conf_ServerAdmin2 ); + printf( " AdminEMail = %s\n", Conf_ServerAdminMail ); printf( " MotdFile = %s\n", Conf_MotdFile ); - printf( " ListenPorts = " ); + printf( " Ports = " ); for( i = 0; i < Conf_ListenPorts_Count; i++ ) { if( i != 0 ) printf( ", " ); printf( "%u", Conf_ListenPorts[i] ); } puts( "" ); - printf( " ServerUID = %ld\n", (INT32)Conf_UID ); - printf( " ServerGID = %ld\n", (INT32)Conf_GID ); + pwd = getpwuid( Conf_UID ); + if( pwd ) printf( " ServerUID = %s\n", pwd->pw_name ); + else printf( " ServerUID = %ld\n", (LONG)Conf_UID ); + grp = getgrgid( Conf_GID ); + if( grp ) printf( " ServerGID = %s\n", grp->gr_name ); + else printf( " ServerGID = %ld\n", (LONG)Conf_GID ); printf( " PingTimeout = %d\n", Conf_PingTimeout ); printf( " PongTimeout = %d\n", Conf_PongTimeout ); printf( " ConnectRetry = %d\n", Conf_ConnectRetry ); + printf( " OperCanUseMode = %s\n", Conf_OperCanMode == TRUE ? "yes" : "no" ); + if( Conf_MaxConnections > 0 ) printf( " MaxConnections = %ld\n", Conf_MaxConnections ); + else printf( " MaxConnections = -1\n" ); puts( "" ); for( i = 0; i < Conf_Oper_Count; i++ ) { if( ! Conf_Oper[i].name[0] ) continue; - /* gueltiger Operator-Block: ausgeben */ + /* Valid "Operator" section */ puts( "[OPERATOR]" ); printf( " Name = %s\n", Conf_Oper[i].name ); printf( " Password = %s\n", Conf_Oper[i].pwd ); @@ -116,14 +133,14 @@ Conf_Test( VOID ) for( i = 0; i < Conf_Server_Count; i++ ) { if( ! Conf_Server[i].name[0] ) continue; - if( ! Conf_Server[i].host[0] ) continue; - /* gueltiger Server-Block: ausgeben */ + /* Valid "Server" section */ puts( "[SERVER]" ); printf( " Name = %s\n", Conf_Server[i].name ); printf( " Host = %s\n", Conf_Server[i].host ); printf( " Port = %d\n", Conf_Server[i].port ); - printf( " Password = %s\n", Conf_Server[i].pwd ); + printf( " MyPassword = %s\n", Conf_Server[i].pwd_in ); + printf( " PeerPassword = %s\n", Conf_Server[i].pwd_out ); printf( " Group = %d\n", Conf_Server[i].group ); puts( "" ); } @@ -132,7 +149,7 @@ Conf_Test( VOID ) { if( ! Conf_Channel[i].name[0] ) continue; - /* gueltiger Channel-Block: ausgeben */ + /* Valid "Channel" section */ puts( "[CHANNEL]" ); printf( " Name = %s\n", Conf_Channel[i].name ); printf( " Modes = %s\n", Conf_Channel[i].modes ); @@ -147,12 +164,16 @@ Conf_Test( VOID ) LOCAL VOID Set_Defaults( VOID ) { - /* Konfigurationsvariablen initialisieren, d.h. auf Default-Werte setzen. */ + /* Initialize configuration variables with default values. */ strcpy( Conf_ServerName, "" ); - strcpy( Conf_ServerInfo, PACKAGE" "VERSION ); + sprintf( Conf_ServerInfo, "%s %s", PACKAGE, VERSION ); strcpy( Conf_ServerPwd, "" ); + strcpy( Conf_ServerAdmin1, "" ); + strcpy( Conf_ServerAdmin2, "" ); + strcpy( Conf_ServerAdminMail, "" ); + strcpy( Conf_MotdFile, MOTD_FILE ); Conf_ListenPorts_Count = 0; @@ -167,13 +188,17 @@ Set_Defaults( VOID ) Conf_Oper_Count = 0; Conf_Server_Count = 0; Conf_Channel_Count = 0; + + Conf_OperCanMode = FALSE; + + Conf_MaxConnections = 0; } /* Set_Defaults */ LOCAL VOID Read_Config( VOID ) { - /* Konfigurationsdatei einlesen. */ + /* Read configuration file. */ CHAR section[LINE_LEN], str[LINE_LEN], *var, *arg, *ptr; INT line; @@ -182,12 +207,14 @@ Read_Config( VOID ) fd = fopen( NGIRCd_ConfFile, "r" ); if( ! fd ) { - /* Keine Konfigurationsdatei gefunden */ + /* No configuration file found! */ Config_Error( LOG_ALERT, "Can't read configuration \"%s\": %s", NGIRCd_ConfFile, strerror( errno )); - Config_Error( LOG_ALERT, PACKAGE" exiting due to fatal errors!" ); + Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE ); exit( 1 ); } + Config_Error( LOG_INFO, "Reading configuration from \"%s\" ...", NGIRCd_ConfFile ); + line = 0; strcpy( section, "" ); while( TRUE ) @@ -196,10 +223,10 @@ Read_Config( VOID ) ngt_TrimStr( str ); line++; - /* Kommentarzeilen und leere Zeilen ueberspringen */ + /* Skip comments and empty lines */ if( str[0] == ';' || str[0] == '#' || str[0] == '\0' ) continue; - /* Anfang eines Abschnittes? */ + /* Is this the beginning of a new section? */ if(( str[0] == '[' ) && ( str[strlen( str ) - 1] == ']' )) { strcpy( section, str ); @@ -209,7 +236,7 @@ Read_Config( VOID ) if( Conf_Oper_Count + 1 > MAX_OPERATORS ) Config_Error( LOG_ERR, "Too many operators configured." ); else { - /* neuen Operator initialisieren */ + /* Initialize new operator structure */ strcpy( Conf_Oper[Conf_Oper_Count].name, "" ); strcpy( Conf_Oper[Conf_Oper_Count].pwd, "" ); Conf_Oper_Count++; @@ -221,11 +248,12 @@ Read_Config( VOID ) if( Conf_Server_Count + 1 > MAX_SERVERS ) Config_Error( LOG_ERR, "Too many servers configured." ); else { - /* neuen Server ("Peer") initialisieren */ + /* Initialize new server structure */ strcpy( Conf_Server[Conf_Server_Count].host, "" ); strcpy( Conf_Server[Conf_Server_Count].ip, "" ); strcpy( Conf_Server[Conf_Server_Count].name, "" ); - strcpy( Conf_Server[Conf_Server_Count].pwd, "" ); + strcpy( Conf_Server[Conf_Server_Count].pwd_in, "" ); + strcpy( Conf_Server[Conf_Server_Count].pwd_out, "" ); Conf_Server[Conf_Server_Count].port = 0; Conf_Server[Conf_Server_Count].group = -1; Conf_Server[Conf_Server_Count].lasttry = time( NULL ) - Conf_ConnectRetry + STARTUP_DELAY; @@ -239,7 +267,7 @@ Read_Config( VOID ) if( Conf_Channel_Count + 1 > MAX_DEFCHANNELS ) Config_Error( LOG_ERR, "Too many pre-defined channels configured." ); else { - /* neuen vordefinierten Channel initialisieren */ + /* Initialize new channel structure */ strcpy( Conf_Channel[Conf_Channel_Count].name, "" ); strcpy( Conf_Channel[Conf_Channel_Count].modes, "" ); strcpy( Conf_Channel[Conf_Channel_Count].topic, "" ); @@ -252,7 +280,7 @@ Read_Config( VOID ) } if( section[0] == 0x1 ) continue; - /* In Variable und Argument zerlegen */ + /* Split line into variable name and parameters */ ptr = strchr( str, '=' ); if( ! ptr ) { @@ -272,7 +300,7 @@ Read_Config( VOID ) fclose( fd ); - /* Wenn kein Port definiert wurde, Port 6667 als Default benutzen */ + /* If there are no ports configured use the default: 6667 */ if( Conf_ListenPorts_Count < 1 ) { Conf_ListenPorts_Count = 1; @@ -284,8 +312,10 @@ Read_Config( VOID ) LOCAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) { + struct passwd *pwd; + struct group *grp; CHAR *ptr; - INT32 port; + LONG port; assert( Line > 0 ); assert( Var != NULL ); @@ -293,29 +323,56 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Name" ) == 0 ) { - /* Der Server-Name */ + /* Server name */ strncpy( Conf_ServerName, Arg, CLIENT_ID_LEN - 1 ); Conf_ServerName[CLIENT_ID_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_ID_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Name\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "Info" ) == 0 ) { - /* Server-Info-Text */ + /* Info text of server */ strncpy( Conf_ServerInfo, Arg, CLIENT_INFO_LEN - 1 ); Conf_ServerInfo[CLIENT_INFO_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_INFO_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Info\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "Password" ) == 0 ) { - /* Server-Passwort */ + /* Global server password */ strncpy( Conf_ServerPwd, Arg, CLIENT_PASS_LEN - 1 ); Conf_ServerPwd[CLIENT_PASS_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_PASS_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Password\" too long!", NGIRCd_ConfFile, Line ); + return; + } + if( strcasecmp( Var, "AdminInfo1" ) == 0 ) + { + /* Administrative info #1 */ + strncpy( Conf_ServerAdmin1, Arg, CLIENT_INFO_LEN - 1 ); + Conf_ServerAdmin1[CLIENT_INFO_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_INFO_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"AdminInfo1\" too long!", NGIRCd_ConfFile, Line ); + return; + } + if( strcasecmp( Var, "AdminInfo2" ) == 0 ) + { + /* Administrative info #2 */ + strncpy( Conf_ServerAdmin2, Arg, CLIENT_INFO_LEN - 1 ); + Conf_ServerAdmin2[CLIENT_INFO_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_INFO_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"AdminInfo2\" too long!", NGIRCd_ConfFile, Line ); + return; + } + if( strcasecmp( Var, "AdminEMail" ) == 0 ) + { + /* Administrative email contact */ + strncpy( Conf_ServerAdminMail, Arg, CLIENT_INFO_LEN - 1 ); + Conf_ServerAdminMail[CLIENT_INFO_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_INFO_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"AdminEMail\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "Ports" ) == 0 ) { - /* Ports, durch "," getrennt, auf denen der Server - * Verbindungen annehmen soll */ + /* Ports on that the server should listen. More port numbers + * must be separated by "," */ ptr = strtok( Arg, "," ); while( ptr ) { @@ -333,42 +390,92 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg ) } if( strcasecmp( Var, "MotdFile" ) == 0 ) { - /* Datei mit der "message of the day" (MOTD) */ + /* "Message of the day" (MOTD) file */ strncpy( Conf_MotdFile, Arg, FNAME_LEN - 1 ); Conf_MotdFile[FNAME_LEN - 1] = '\0'; + if( strlen( Arg ) > FNAME_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MotdFile\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "ServerUID" ) == 0 ) { - /* UID, mit der der Daemon laufen soll */ - Conf_UID = (UINT)atoi( Arg ); + /* UID the daemon should switch to */ + pwd = getpwnam( Arg ); + if( pwd ) Conf_UID = pwd->pw_uid; + else + { +#ifdef HAVE_ISDIGIT + if( ! isdigit( *Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"ServerUID\" is not a number!", NGIRCd_ConfFile, Line ); + else +#endif + Conf_UID = (UINT)atoi( Arg ); + } return; } if( strcasecmp( Var, "ServerGID" ) == 0 ) { - /* GID, mit der der Daemon laufen soll */ - Conf_GID = (UINT)atoi( Arg ); + /* GID the daemon should use */ + grp = getgrnam( Arg ); + if( grp ) Conf_GID = grp->gr_gid; + else + { +#ifdef HAVE_ISDIGIT + if( ! isdigit( *Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"ServerGID\" is not a number!", NGIRCd_ConfFile, Line ); + else +#endif + Conf_GID = (UINT)atoi( Arg ); + } return; } if( strcasecmp( Var, "PingTimeout" ) == 0 ) { - /* PING-Timeout */ + /* PING timeout */ Conf_PingTimeout = atoi( Arg ); - if(( Conf_PingTimeout ) < 5 ) Conf_PingTimeout = 5; + if( Conf_PingTimeout < 5 ) + { + Config_Error( LOG_WARNING, "%s, line %d: Value of \"PingTimeout\" too low!", NGIRCd_ConfFile, Line ); + Conf_PingTimeout = 5; + } return; } if( strcasecmp( Var, "PongTimeout" ) == 0 ) { - /* PONG-Timeout */ + /* PONG timeout */ Conf_PongTimeout = atoi( Arg ); - if(( Conf_PongTimeout ) < 5 ) Conf_PongTimeout = 5; + if( Conf_PongTimeout < 5 ) + { + Config_Error( LOG_WARNING, "%s, line %d: Value of \"PongTimeout\" too low!", NGIRCd_ConfFile, Line ); + Conf_PongTimeout = 5; + } return; } if( strcasecmp( Var, "ConnectRetry" ) == 0 ) { - /* Sekunden zwischen Verbindungsversuchen zu anderen Servern */ + /* Seconds between connection attempts to other servers */ Conf_ConnectRetry = atoi( Arg ); - if(( Conf_ConnectRetry ) < 5 ) Conf_ConnectRetry = 5; + if( Conf_ConnectRetry < 5 ) + { + Config_Error( LOG_WARNING, "%s, line %d: Value of \"ConnectRetry\" too low!", NGIRCd_ConfFile, Line ); + Conf_ConnectRetry = 5; + } + return; + } + if( strcasecmp( Var, "OperCanUseMode" ) == 0 ) + { + /* Are IRC operators allowed to use MODE in channels they aren't Op in? */ + if( strcasecmp( Arg, "yes" ) == 0 ) Conf_OperCanMode = TRUE; + else if( strcasecmp( Arg, "true" ) == 0 ) Conf_OperCanMode = TRUE; + else if( atoi( Arg ) != 0 ) Conf_OperCanMode = TRUE; + else Conf_OperCanMode = FALSE; + return; + } + if( strcasecmp( Var, "MaxConnections" ) == 0 ) + { + /* Maximum number of connections. Values <= 0 are equal to "no limit". */ +#ifdef HAVE_ISDIGIT + if( ! isdigit( *Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MaxConnections\" is not a number!", NGIRCd_ConfFile, Line ); + else +#endif + Conf_MaxConnections = atol( Arg ); return; } @@ -386,16 +493,18 @@ Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Name" ) == 0 ) { - /* Name des IRC Operator */ - strncpy( Conf_Oper[Conf_Oper_Count - 1].name, Arg, CLIENT_ID_LEN - 1 ); - Conf_Oper[Conf_Oper_Count - 1].name[CLIENT_ID_LEN - 1] = '\0'; + /* Name of IRC operator */ + strncpy( Conf_Oper[Conf_Oper_Count - 1].name, Arg, CLIENT_PASS_LEN - 1 ); + Conf_Oper[Conf_Oper_Count - 1].name[CLIENT_PASS_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_PASS_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Name\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "Password" ) == 0 ) { - /* Passwort des IRC Operator */ + /* Password of IRC operator */ strncpy( Conf_Oper[Conf_Oper_Count - 1].pwd, Arg, CLIENT_PASS_LEN - 1 ); Conf_Oper[Conf_Oper_Count - 1].pwd[CLIENT_PASS_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_PASS_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Password\" too long!", NGIRCd_ConfFile, Line ); return; } @@ -406,7 +515,7 @@ Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg ) LOCAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) { - INT32 port; + LONG port; assert( Line > 0 ); assert( Var != NULL ); @@ -414,28 +523,39 @@ Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Host" ) == 0 ) { - /* Hostname des Servers */ + /* Hostname of the server */ strncpy( Conf_Server[Conf_Server_Count - 1].host, Arg, HOST_LEN - 1 ); Conf_Server[Conf_Server_Count - 1].host[HOST_LEN - 1] = '\0'; + if( strlen( Arg ) > HOST_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Host\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "Name" ) == 0 ) { - /* Name des Servers ("Nick") */ + /* Name of the server ("Nick"/"ID") */ strncpy( Conf_Server[Conf_Server_Count - 1].name, Arg, CLIENT_ID_LEN - 1 ); Conf_Server[Conf_Server_Count - 1].name[CLIENT_ID_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_ID_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Name\" too long!", NGIRCd_ConfFile, Line ); return; } - if( strcasecmp( Var, "Password" ) == 0 ) + if( strcasecmp( Var, "MyPassword" ) == 0 ) + { + /* Password of this server which is sent to the peer */ + strncpy( Conf_Server[Conf_Server_Count - 1].pwd_in, Arg, CLIENT_PASS_LEN - 1 ); + Conf_Server[Conf_Server_Count - 1].pwd_in[CLIENT_PASS_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_PASS_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MyPassword\" too long!", NGIRCd_ConfFile, Line ); + return; + } + if( strcasecmp( Var, "PeerPassword" ) == 0 ) { - /* Passwort des Servers */ - strncpy( Conf_Server[Conf_Server_Count - 1].pwd, Arg, CLIENT_PASS_LEN - 1 ); - Conf_Server[Conf_Server_Count - 1].pwd[CLIENT_PASS_LEN - 1] = '\0'; + /* Passwort of the peer which must be received */ + strncpy( Conf_Server[Conf_Server_Count - 1].pwd_out, Arg, CLIENT_PASS_LEN - 1 ); + Conf_Server[Conf_Server_Count - 1].pwd_out[CLIENT_PASS_LEN - 1] = '\0'; + if( strlen( Arg ) > CLIENT_PASS_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"PeerPassword\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "Port" ) == 0 ) { - /* Port, zu dem Verbunden werden soll */ + /* Port to which this server should connect */ port = atol( Arg ); if( port > 0 && port < 0xFFFF ) Conf_Server[Conf_Server_Count - 1].port = (INT)port; else Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Illegal port number %ld!", NGIRCd_ConfFile, Line, port ); @@ -443,7 +563,11 @@ Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg ) } if( strcasecmp( Var, "Group" ) == 0 ) { - /* Server-Gruppe */ + /* Server group */ +#ifdef HAVE_ISDIGIT + if( ! isdigit( *Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Group\" is not a number!", NGIRCd_ConfFile, Line ); + else +#endif Conf_Server[Conf_Server_Count - 1].group = atoi( Arg ); return; } @@ -461,23 +585,26 @@ Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg ) if( strcasecmp( Var, "Name" ) == 0 ) { - /* Hostname des Servers */ + /* Name of the channel */ strncpy( Conf_Channel[Conf_Channel_Count - 1].name, Arg, CHANNEL_NAME_LEN - 1 ); Conf_Channel[Conf_Channel_Count - 1].name[CHANNEL_NAME_LEN - 1] = '\0'; + if( strlen( Arg ) > CHANNEL_NAME_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Name\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "Modes" ) == 0 ) { - /* Name des Servers ("Nick") */ + /* Initial modes */ strncpy( Conf_Channel[Conf_Channel_Count - 1].modes, Arg, CHANNEL_MODE_LEN - 1 ); Conf_Channel[Conf_Channel_Count - 1].modes[CHANNEL_MODE_LEN - 1] = '\0'; + if( strlen( Arg ) > CHANNEL_MODE_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Modes\" too long!", NGIRCd_ConfFile, Line ); return; } if( strcasecmp( Var, "Topic" ) == 0 ) { - /* Passwort des Servers */ + /* Initial topic */ strncpy( Conf_Channel[Conf_Channel_Count - 1].topic, Arg, CHANNEL_TOPIC_LEN - 1 ); Conf_Channel[Conf_Channel_Count - 1].topic[CHANNEL_TOPIC_LEN - 1] = '\0'; + if( strlen( Arg ) > CHANNEL_TOPIC_LEN - 1 ) Config_Error( LOG_WARNING, "%s, line %d: Value of \"Topic\" too long!", NGIRCd_ConfFile, Line ); return; } @@ -488,37 +615,62 @@ Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg ) LOCAL VOID Validate_Config( VOID ) { - /* Konfiguration ueberpruefen */ + /* Validate configuration settings. */ if( ! Conf_ServerName[0] ) { - /* Kein Servername konfiguriert */ - Config_Error( LOG_ALERT, "No server name configured in \"%s\"!", NGIRCd_ConfFile ); - Config_Error( LOG_ALERT, PACKAGE" exiting due to fatal errors!" ); + /* No server name configured! */ + Config_Error( LOG_ALERT, "No server name configured in \"%s\" ('ServerName')!", NGIRCd_ConfFile ); + Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE ); + exit( 1 ); + } + +#ifdef STRICT_RFC + if( ! Conf_ServerAdminMail[0] ) + { + /* No administrative contact configured! */ + Config_Error( LOG_ALERT, "No administrator email address configured in \"%s\" ('AdminEMail')!", NGIRCd_ConfFile ); + Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE ); exit( 1 ); } +#endif + + if( ! Conf_ServerAdmin1[0] && ! Conf_ServerAdmin2[0] && ! Conf_ServerAdminMail[0] ) + { + /* No administrative information configured! */ + Log( LOG_WARNING, "No administrative information configured but required by RFC!" ); + } } /* Validate_Config */ -LOCAL VOID -Config_Error( CONST INT Level, CONST CHAR *Format, ... ) +#ifdef PROTOTYPES +LOCAL VOID Config_Error( CONST INT Level, CONST CHAR *Format, ... ) +#else +LOCAL VOID Config_Error( Level, Format, va_alist ) +CONST INT Level; +CONST CHAR *Format; +va_dcl +#endif { - /* Fehler! Auf Console und/oder ins Log schreiben */ + /* Error! Write to console and/or logfile. */ CHAR msg[MAX_LOG_MSG_LEN]; va_list ap; assert( Format != NULL ); - /* String mit variablen Argumenten zusammenbauen ... */ +#ifdef PROTOTYPES va_start( ap, Format ); +#else + va_start( ap ); +#endif vsnprintf( msg, MAX_LOG_MSG_LEN, Format, ap ); va_end( ap ); - - /* Im "normalen Betrieb" soll der Log-Mechanismus des ngIRCd verwendet - * werden, beim Testen der Konfiguration jedoch nicht, hier sollen alle - * Meldungen direkt auf die Konsole ausgegeben werden: */ - if( Use_Log ) Log( Level, msg ); + + /* During "normal operations" the log functions of the daemon should + * be used, but during testing of the configuration file, all messages + * should go directly to the console: */ + if( Use_Log ) Log( Level, "%s", msg ); else puts( msg ); } /* Config_Error */