configtest would still print "-1" for MaxConnections, MaxConnectionsIP and MaxJoins

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 0328f9402577c526060241852122ee9bd8ffc9b4..3c7b42d5063d7d90b8d260a308af9db1bef1f98b 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conf.c,v 1.98 2007/06/28 05:15:18 fw Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.100 2007/10/24 00:48:41 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -205,9 +205,9 @@ Conf_Test( void )
        printf( "  OperCanUseMode = %s\n", Conf_OperCanMode == true ? "yes" : "no" );
        printf( "  OperServerMode = %s\n", Conf_OperServerMode == true? "yes" : "no" );
        printf( "  PredefChannelsOnly = %s\n", Conf_PredefChannelsOnly == true ? "yes" : "no" );
-       printf( "  MaxConnections = %ld\n", Conf_MaxConnections>0 ? Conf_MaxConnections : -1);
-       printf( "  MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP>0 ? Conf_MaxConnectionsIP : -1);
-       printf( "  MaxJoins = %d\n\n", Conf_MaxJoins>0 ? Conf_MaxJoins : -1);
+       printf( "  MaxConnections = %ld\n", Conf_MaxConnections);
+       printf( "  MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
+       printf( "  MaxJoins = %d\n\n", Conf_MaxJoins);
 
        for( i = 0; i < Conf_Oper_Count; i++ ) {
                if( ! Conf_Oper[i].name[0] ) continue;
@@ -447,7 +447,7 @@ Set_Defaults( bool InitServers )
        Conf_PredefChannelsOnly = false;
        Conf_OperServerMode = false;
 
-       Conf_MaxConnections = -1;
+       Conf_MaxConnections = 0;
        Conf_MaxConnectionsIP = 5;
        Conf_MaxJoins = 10;
 
@@ -794,7 +794,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                return;
        }
        if( strcasecmp( Var, "MaxConnections" ) == 0 ) {
-               /* Maximum number of connections. Values <= 0 are equal to "no limit". */
+               /* Maximum number of connections. 0 -> "no limit". */
 #ifdef HAVE_ISDIGIT
                if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var);
                else
@@ -803,7 +803,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                return;
        }
        if( strcasecmp( Var, "MaxConnectionsIP" ) == 0 ) {
-               /* Maximum number of simultaneous connections from one IP. Values <= 0 -> "no limit" */
+               /* Maximum number of simultaneous connections from one IP. 0 -> "no limit" */
 #ifdef HAVE_ISDIGIT
                if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
                else
@@ -812,7 +812,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
                return;
        }
        if( strcasecmp( Var, "MaxJoins" ) == 0 ) {
-               /* Maximum number of channels a user can join. Values <= 0 are equal to "no limit". */
+               /* Maximum number of channels a user can join. 0 -> "no limit". */
 #ifdef HAVE_ISDIGIT
                if( ! isdigit( (int)*Arg )) Config_Error_NaN( Line, Var );
                else