- anstelle von "ListenPorts" wird nun korrekt "Ports" ausgegeben.

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index bd8b5eeb8d674636807e7d958cea9c1fcb364ad4..597ac065881d605d42fb559759120f9434eedfbf 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.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: conf.c,v 1.29 2002/09/16 09:13:06 alex Exp $
+ * $Id: conf.c,v 1.37 2002/11/18 18:47:42 alex Exp $
  *
  * conf.h: Konfiguration des ngircd
  */
@@ -25,6 +25,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <pwd.h>
+#include <grp.h>
+#include <sys/types.h>
 
 #include "ngircd.h"
 #include "conn.h"
@@ -67,7 +70,9 @@ Conf_Test( VOID )
 {
        /* Konfiguration einlesen, ueberpruefen und ausgeben. */
 
-       UINT i;
+       struct passwd *pwd;
+       struct group *grp;
+       INT i;
 
        Use_Log = FALSE;
        Set_Defaults( );
@@ -91,19 +96,25 @@ Conf_Test( VOID )
        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++ )
@@ -177,6 +188,8 @@ Set_Defaults( VOID )
        Conf_Channel_Count = 0;
 
        Conf_OperCanMode = FALSE;
+       
+       Conf_MaxConnections = 0;
 } /* Set_Defaults */
 
 
@@ -294,8 +307,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 );
@@ -372,13 +387,17 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg )
        if( strcasecmp( Var, "ServerUID" ) == 0 )
        {
                /* UID, mit der der Daemon laufen soll */
-               Conf_UID = (UINT)atoi( Arg );
+               pwd = getpwnam( Arg );
+               if( pwd ) Conf_UID = pwd->pw_uid;
+               else Conf_UID = (UINT)atoi( Arg );
                return;
        }
        if( strcasecmp( Var, "ServerGID" ) == 0 )
        {
                /* GID, mit der der Daemon laufen soll */
-               Conf_GID = (UINT)atoi( Arg );
+               grp = getgrnam( Arg );
+               if( grp ) Conf_GID = grp->gr_gid;
+               else Conf_GID = (UINT)atoi( Arg );
                return;
        }
        if( strcasecmp( Var, "PingTimeout" ) == 0 )
@@ -411,6 +430,13 @@ Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg )
                else Conf_OperCanMode = FALSE;
                return;
        }
+       if( strcasecmp( Var, "MaxConnections" ) == 0 )
+       {
+               /* Maximale Anzahl von Verbindungen. Werte <= 0 stehen
+                * fuer "kein Limit". */
+               Conf_MaxConnections = atol( Arg );
+               return;
+       }
                
        Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var );
 } /* Handle_GLOBAL */
@@ -446,7 +472,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 );
@@ -539,7 +565,7 @@ Validate_Config( VOID )
        }
 
 #ifdef STRICT_RFC
-       if( ! ConfAdminMail[0] )
+       if( ! Conf_ServerAdminMail[0] )
        {
                /* Keine Server-Information konfiguriert */
                Config_Error( LOG_ALERT, "No administrator email address configured in \"%s\" ('AdminEMail')!", NGIRCd_ConfFile );
@@ -548,7 +574,7 @@ Validate_Config( VOID )
        }
 #endif
 
-       if( ! Conf_ServerAdmin1[0] && ! Conf_ServerAdmin1[0] && ! Conf_ServerAdminMail[0] )
+       if( ! Conf_ServerAdmin1[0] && ! Conf_ServerAdmin2[0] && ! Conf_ServerAdminMail[0] )
        {
                /* Keine Server-Information konfiguriert */
                Log( LOG_WARNING, "No server information configured but required by RFC!" );
@@ -584,7 +610,7 @@ va_dcl
        /* 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 );
+       if( Use_Log ) Log( Level, "%s", msg );
        else puts( msg );
 } /* Config_Error */