X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconf.c;h=a1f8fdc37e35576f8de938c49a19b5bf4874141c;hp=73d1cf49519a183070882b299edfc8c40097948b;hb=7e1b3b9157b9946d18d252b908fb28a85a0fa0e7;hpb=040f5422f2c8262ab19832f1e9d0e269afad8ec1

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 73d1cf49..a1f8fdc3 100644
--- 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.24 2002/05/21 00:10:16 alex Exp $
+ * $Id: conf.c,v 1.28 2002/09/02 14:59:17 alex Exp $
  *
  * conf.h: Konfiguration des ngircd
  */
@@ -27,9 +27,11 @@
 #include <unistd.h>
 
 #include "ngircd.h"
+#include "conn.h"
 #include "client.h"
 #include "defines.h"
 #include "log.h"
+#include "resolve.h"
 #include "tool.h"
 
 #include "exp.h"
@@ -39,19 +41,20 @@
 LOCAL BOOLEAN Use_Log = TRUE;
 
 
-LOCAL VOID Set_Defaults( VOID );
-LOCAL VOID Read_Config( VOID );
-LOCAL VOID Validate_Config( VOID );
+LOCAL VOID Set_Defaults PARAMS(( VOID ));
+LOCAL VOID Read_Config PARAMS(( VOID ));
+LOCAL VOID Validate_Config PARAMS(( VOID ));
 
-GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg );
-GLOBAL VOID Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg );
-GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg );
-GLOBAL VOID Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg );
+LOCAL VOID Handle_GLOBAL PARAMS(( INT Line, CHAR *Var, CHAR *Arg ));
+LOCAL VOID Handle_OPERATOR PARAMS(( INT Line, CHAR *Var, CHAR *Arg ));
+LOCAL VOID Handle_SERVER PARAMS(( INT Line, CHAR *Var, CHAR *Arg ));
+LOCAL VOID Handle_CHANNEL PARAMS(( INT Line, CHAR *Var, CHAR *Arg ));
 
-LOCAL VOID Config_Error( CONST INT Level, CONST CHAR *Format, ... );
+LOCAL VOID Config_Error PARAMS(( CONST INT Level, CONST CHAR *Format, ... ));
 
 
-GLOBAL VOID Conf_Init( VOID )
+GLOBAL VOID
+Conf_Init( VOID )
 {
 	Set_Defaults( );
 	Read_Config( );
@@ -59,7 +62,8 @@ GLOBAL VOID Conf_Init( VOID )
 } /* Config_Init */
 
 
-GLOBAL INT Conf_Test( VOID )
+GLOBAL INT
+Conf_Test( VOID )
 {
 	/* Konfiguration einlesen, ueberpruefen und ausgeben. */
 
@@ -96,10 +100,14 @@ GLOBAL INT Conf_Test( VOID )
 	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" );
 	puts( "" );
 
 	for( i = 0; i < Conf_Oper_Count; i++ )
 	{
+		if( ! Conf_Oper[i].name[0] ) continue;
+		
+		/* gueltiger Operator-Block: ausgeben */
 		puts( "[OPERATOR]" );
 		printf( "  Name = %s\n", Conf_Oper[i].name );
 		printf( "  Password = %s\n", Conf_Oper[i].pwd );
@@ -108,6 +116,10 @@ GLOBAL INT 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 */
 		puts( "[SERVER]" );
 		printf( "  Name = %s\n", Conf_Server[i].name );
 		printf( "  Host = %s\n", Conf_Server[i].host );
@@ -119,6 +131,9 @@ GLOBAL INT Conf_Test( VOID )
 
 	for( i = 0; i < Conf_Channel_Count; i++ )
 	{
+		if( ! Conf_Channel[i].name[0] ) continue;
+		
+		/* gueltiger Channel-Block: ausgeben */
 		puts( "[CHANNEL]" );
 		printf( "  Name = %s\n", Conf_Channel[i].name );
 		printf( "  Modes = %s\n", Conf_Channel[i].modes );
@@ -130,18 +145,13 @@ GLOBAL INT Conf_Test( VOID )
 } /* Conf_Test */
 
 
-GLOBAL VOID Conf_Exit( VOID )
-{
-	/* ... */
-} /* Config_Exit */
-
-
-LOCAL VOID Set_Defaults( VOID )
+LOCAL VOID
+Set_Defaults( VOID )
 {
 	/* Konfigurationsvariablen initialisieren, d.h. auf Default-Werte setzen. */
 
 	strcpy( Conf_ServerName, "" );
-	strcpy( Conf_ServerInfo, PACKAGE" "VERSION );
+	sprintf( Conf_ServerInfo, "%s %s", PACKAGE, VERSION );
 	strcpy( Conf_ServerPwd, "" );
 
 	strcpy( Conf_MotdFile, MOTD_FILE );
@@ -158,10 +168,13 @@ LOCAL VOID Set_Defaults( VOID )
 	Conf_Oper_Count = 0;
 	Conf_Server_Count = 0;
 	Conf_Channel_Count = 0;
+
+	Conf_OperCanMode = FALSE;
 } /* Set_Defaults */
 
 
-LOCAL VOID Read_Config( VOID )
+LOCAL VOID
+Read_Config( VOID )
 {
 	/* Konfigurationsdatei einlesen. */
 
@@ -174,7 +187,7 @@ LOCAL VOID Read_Config( VOID )
 	{
 		/* Keine Konfigurationsdatei gefunden */
 		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 );
 	}
 
@@ -271,7 +284,8 @@ LOCAL VOID Read_Config( VOID )
 } /* Read_Config */
 
 
-GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg )
+LOCAL VOID
+Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg )
 {
 	CHAR *ptr;
 	INT32 port;
@@ -360,12 +374,22 @@ GLOBAL VOID Handle_GLOBAL( INT Line, CHAR *Var, CHAR *Arg )
 		if(( Conf_ConnectRetry ) < 5 ) Conf_ConnectRetry = 5;
 		return;
 	}
+	if( strcasecmp( Var, "OperCanUseMode" ) == 0 )
+	{
+		/* Koennen IRC-Operatoren immer MODE benutzen? */
+		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;
+	}
 		
 	Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var );
 } /* Handle_GLOBAL */
 
 
-GLOBAL VOID Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg )
+LOCAL VOID
+Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg )
 {
 	assert( Line > 0 );
 	assert( Var != NULL );
@@ -391,7 +415,8 @@ GLOBAL VOID Handle_OPERATOR( INT Line, CHAR *Var, CHAR *Arg )
 } /* Handle_OPERATOR */
 
 
-GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg )
+LOCAL VOID
+Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg )
 {
 	INT32 port;
 	
@@ -439,7 +464,8 @@ GLOBAL VOID Handle_SERVER( INT Line, CHAR *Var, CHAR *Arg )
 } /* Handle_SERVER */
 
 
-GLOBAL VOID Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg )
+LOCAL VOID
+Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg )
 {
 	assert( Line > 0 );
 	assert( Var != NULL );
@@ -471,7 +497,8 @@ GLOBAL VOID Handle_CHANNEL( INT Line, CHAR *Var, CHAR *Arg )
 } /* Handle_CHANNEL */
 
 
-LOCAL VOID Validate_Config( VOID )
+LOCAL VOID
+Validate_Config( VOID )
 {
 	/* Konfiguration ueberpruefen */
 	
@@ -479,13 +506,20 @@ LOCAL VOID Validate_Config( VOID )
 	{
 		/* 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!" );
+		Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
 		exit( 1 );
 	}
 } /* Validate_Config */
 
 
+#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 */
 
@@ -495,7 +529,11 @@ LOCAL VOID Config_Error( CONST INT Level, CONST CHAR *Format, ... )
 	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 );