#include "portab.h"
-static char UNUSED id[] = "$Id: conf.c,v 1.43 2002/12/13 17:32:33 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.47 2002/12/18 02:53:36 alex Exp $";
#include "imp.h"
#include <assert.h>
#include <pwd.h>
#include <grp.h>
#include <sys/types.h>
+#include <unistd.h>
#ifdef HAVE_CTYPE_H
# include <ctype.h>
LOCAL VOID Set_Defaults PARAMS(( VOID ));
LOCAL VOID Read_Config PARAMS(( VOID ));
-LOCAL VOID Validate_Config PARAMS(( VOID ));
+LOCAL VOID Validate_Config PARAMS(( BOOLEAN TestOnly ));
LOCAL VOID Handle_GLOBAL PARAMS(( INT Line, CHAR *Var, CHAR *Arg ));
LOCAL VOID Handle_OPERATOR PARAMS(( INT Line, CHAR *Var, CHAR *Arg ));
{
Set_Defaults( );
Read_Config( );
- Validate_Config( );
+ Validate_Config( FALSE );
} /* Config_Init */
Set_Defaults( );
Read_Config( );
+ Validate_Config( TRUE );
/* If stdin is a valid tty wait for a key: */
if( isatty( fileno( stdout )))
else printf( " MaxConnections = -1\n" );
if( Conf_MaxJoins > 0 ) printf( " MaxJoins = %d\n", Conf_MaxJoins );
else printf( " MaxJoins = -1\n" );
- if( Conf_MaxPChannels > 0 ) printf( " MaxPChannels = %d\n", Conf_MaxPChannels );
- else printf( " MaxPChannels = -1\n" );
puts( "" );
for( i = 0; i < Conf_Oper_Count; i++ )
Conf_MaxConnections = -1;
Conf_MaxJoins = 10;
- Conf_MaxPChannels = -1;
} /* Set_Defaults */
Conf_MaxJoins = atoi( Arg );
return;
}
- if( strcasecmp( Var, "MaxPChannels" ) == 0 )
- {
- /* Maximum number of persistent channels in the network. Values <= 0 are equal to "no limit". */
-#ifdef HAVE_ISDIGIT
- if( ! isdigit( *Arg )) Config_Error( LOG_WARNING, "%s, line %d: Value of \"MaxPChannels\" is not a number!", NGIRCd_ConfFile, Line );
- else
-#endif
- Conf_MaxPChannels = atoi( Arg );
- return;
- }
Config_Error( LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var );
} /* Handle_GLOBAL */
LOCAL VOID
-Validate_Config( VOID )
+Validate_Config( BOOLEAN Configtest )
{
/* Validate configuration settings. */
{
/* 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 );
+ if( ! Configtest )
+ {
+ Config_Error( LOG_ALERT, "%s exiting due to fatal errors!", PACKAGE );
+ exit( 1 );
+ }
}
#ifdef STRICT_RFC
{
/* 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 );
+ if( ! Configtest )
+ {
+ 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!" );
+ Config_Error( LOG_WARNING, "No administrative information configured but required by RFC!" );
}
+#ifdef FD_SETSIZE
+ if(( Conf_MaxConnections > (LONG)FD_SETSIZE ) || ( Conf_MaxConnections < 1 ))
+ {
+ Conf_MaxConnections = (LONG)FD_SETSIZE;
+ Config_Error( LOG_ERR, "Setting MaxConnections to %ld, select() can't handle more file descriptors!", Conf_MaxConnections );
+ }
+#else
+ Config_Error( LOG_WARN, "Don't know how many file descriptors select() can handle on this system, don't set MaxConnections too high!" );
+#endif
} /* Validate_Config */