Add new server config option to disable automatic connect. (Tassilo Schweyer)

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index b54c3f15feaf893608a5e17d563dd7d69b690445..0328f9402577c526060241852122ee9bd8ffc9b4 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.95 2006/11/10 10:05:08 alex Exp $";
+static char UNUSED id[] = "$Id: conf.c,v 1.98 2007/06/28 05:15:18 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -230,7 +230,8 @@ Conf_Test( void )
                printf( "  Port = %u\n", (unsigned int)Conf_Server[i].port );
                printf( "  MyPassword = %s\n", Conf_Server[i].pwd_in );
                printf( "  PeerPassword = %s\n", Conf_Server[i].pwd_out );
-               printf( "  Group = %d\n\n", Conf_Server[i].group );
+               printf( "  Group = %d\n", Conf_Server[i].group );
+               printf( "  Passive = %s\n\n", Conf_Server[i].flags & CONF_SFLAG_DISABLED ? "yes" : "no");
        }
 
        for( i = 0; i < Conf_Channel_Count; i++ ) {
@@ -240,6 +241,8 @@ Conf_Test( void )
                puts( "[CHANNEL]" );
                printf( "  Name = %s\n", Conf_Channel[i].name );
                printf( "  Modes = %s\n", Conf_Channel[i].modes );
+               printf( "  Key = %s\n", Conf_Channel[i].key );
+               printf( "  MaxUsers = %lu\n", Conf_Channel[i].maxusers );
 
                topic = (char*)array_start(&Conf_Channel[i].topic);
                printf( "  Topic = %s\n\n", topic ? topic : "");
@@ -334,6 +337,24 @@ Conf_EnableServer( char *Name, UINT16 Port )
 } /* Conf_EnableServer */
 
 
+GLOBAL bool
+Conf_EnablePassiveServer(const char *Name)
+{
+       /* Enable specified server */
+       int i;
+
+       assert( Name != NULL );
+       for (i = 0; i < MAX_SERVERS; i++) {
+               if ((strcasecmp( Conf_Server[i].name, Name ) == 0) && (Conf_Server[i].port > 0)) {
+                       /* BINGO! Enable server */
+                       Conf_Server[i].flags &= ~CONF_SFLAG_DISABLED;
+                       return true;
+               }
+       }
+       return false;
+} /* Conf_EnablePassiveServer */
+
+
 GLOBAL bool
 Conf_DisableServer( char *Name )
 {
@@ -555,6 +576,8 @@ Read_Config( void )
                                        /* Initialize new channel structure */
                                        strcpy( Conf_Channel[Conf_Channel_Count].name, "" );
                                        strcpy( Conf_Channel[Conf_Channel_Count].modes, "" );
+                                       strcpy( Conf_Channel[Conf_Channel_Count].key, "" );
+                                       Conf_Channel[Conf_Channel_Count].maxusers = 0;
                                        array_free(&Conf_Channel[Conf_Channel_Count].topic);
                                        Conf_Channel_Count++;
                                }
@@ -916,12 +939,32 @@ Handle_SERVER( int Line, char *Var, char *Arg )
                New_Server.group = atoi( Arg );
                return;
        }
+       if( strcasecmp( Var, "Passive" ) == 0 ) {
+               if (Check_ArgIsTrue(Arg))
+                       New_Server.flags |= CONF_SFLAG_DISABLED;
+               return;
+       }
        
        Config_Error( LOG_ERR, "%s, line %d (section \"Server\"): Unknown variable \"%s\"!",
                                                                NGIRCd_ConfFile, Line, Var );
 } /* Handle_SERVER */
 
 
+static bool
+Handle_Channelname(size_t chancount, const char *name)
+{
+       size_t size = sizeof( Conf_Channel[chancount].name );
+       char *dest = Conf_Channel[chancount].name;
+
+       if (*name && *name != '#') {
+               *dest = '#';
+               --size;
+               ++dest;
+       }
+       return size > strlcpy(dest, name, size);
+}
+
+
 static void
 Handle_CHANNEL( int Line, char *Var, char *Arg )
 {
@@ -935,9 +978,7 @@ Handle_CHANNEL( int Line, char *Var, char *Arg )
                chancount = Conf_Channel_Count - 1;
 
        if( strcasecmp( Var, "Name" ) == 0 ) {
-               /* Name of the channel */
-               len = strlcpy( Conf_Channel[chancount].name, Arg, sizeof( Conf_Channel[chancount].name ));
-               if (len >= sizeof( Conf_Channel[chancount].name ))
+               if (!Handle_Channelname(chancount, Arg))
                        Config_Error_TooLong( Line, Var );
                return;
        }
@@ -955,6 +996,22 @@ Handle_CHANNEL( int Line, char *Var, char *Arg )
                return;
        }
 
+       if( strcasecmp( Var, "Key" ) == 0 ) {
+               /* Initial Channel Key (mode k) */
+               len = strlcpy(Conf_Channel[chancount].key, Arg, sizeof(Conf_Channel[chancount].key));
+               if (len >= sizeof( Conf_Channel[chancount].key ))
+                       Config_Error_TooLong(Line, Var);
+               return;
+       }
+
+       if( strcasecmp( Var, "MaxUsers" ) == 0 ) {
+               /* maximum user limit, mode l */
+               Conf_Channel[chancount].maxusers = (unsigned long) atol(Arg);
+               if (Conf_Channel[chancount].maxusers == 0)
+                       Config_Error_NaN(Line, Var);
+               return;
+       }
+
        Config_Error( LOG_ERR, "%s, line %d (section \"Channel\"): Unknown variable \"%s\"!",
                                                                NGIRCd_ConfFile, Line, Var );
 } /* Handle_CHANNEL */