Silence compiler warning in Init_New_Client()

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

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index a58ac26e2c301cdb108e1350d3ac7b1e9aded0c4..120db21641b671563c365697b3bdd126670ddace 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -388,7 +388,7 @@ Conf_Test( void )
        printf("  MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP);
        printf("  MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1);
        printf("  MaxNickLength = %u\n", Conf_MaxNickLength - 1);
-       printf("  MaxPenaltyTime = %ld\n", Conf_MaxPenaltyTime);
+       printf("  MaxPenaltyTime = %ld\n", (long)Conf_MaxPenaltyTime);
        printf("  MaxListSize = %d\n", Conf_MaxListSize);
        printf("  PingTimeout = %d\n", Conf_PingTimeout);
        printf("  PongTimeout = %d\n", Conf_PongTimeout);
@@ -853,7 +853,7 @@ no_listenports(void)
 static bool
 Read_TextFile(const char *Filename, const char *Name, array *Destination)
 {
-       char line[127];
+       char line[COMMAND_LEN];
        FILE *fp;
        int line_no = 1;
 
@@ -942,16 +942,13 @@ Read_Config(bool TestOnly, bool IsStarting)
 
                                        if( Conf_Server[i].conn_id == Conf_Server[n].conn_id ) {
                                                Init_Server_Struct( &Conf_Server[n] );
-#ifdef DEBUG
-                                               Log(LOG_DEBUG,"Deleted unused duplicate server %d (kept %d).",
-                                                                                               n, i );
-#endif
+                                               LogDebug("Deleted unused duplicate server %d (kept %d).", n, i);
                                        }
                                }
                        } else {
                                /* Mark server as "once" */
                                Conf_Server[i].flags |= CONF_SFLAG_ONCE;
-                               Log( LOG_DEBUG, "Marked server %d as \"once\"", i );
+                               LogDebug("Marked server %d as \"once\"", i);
                        }
                }
        }
@@ -2003,6 +2000,11 @@ Handle_CHANNEL(const char *File, int Line, char *Var, char *Arg)
                        Config_Error_TooLong(File, Line, Var);
                return;
        }
+       if( strcasecmp( Var, "Autojoin" ) == 0 ) {
+               /* Check autojoin */
+               chan->autojoin = Check_ArgIsTrue(Arg);
+               return;
+       }
        if( strcasecmp( Var, "Key" ) == 0 ) {
                /* Initial Channel Key (mode k) */
                len = strlcpy(chan->key, Arg, sizeof(chan->key));
@@ -2049,9 +2051,7 @@ Validate_Config(bool Configtest, bool Rehash)
 {
        /* Validate configuration settings. */
 
-#ifdef DEBUG
        int i, servers, servers_once;
-#endif
        bool config_valid = true;
        char *ptr;
 
@@ -2125,7 +2125,6 @@ Validate_Config(bool Configtest, bool Rehash)
                             "Maximum penalty increase ('MaxPenaltyTime') is set to %ld, this is not recommended!",
                             Conf_MaxPenaltyTime);
 
-#ifdef DEBUG
        servers = servers_once = 0;
        for (i = 0; i < MAX_SERVERS; i++) {
                if (Conf_Server[i].name[0]) {
@@ -2134,12 +2133,10 @@ Validate_Config(bool Configtest, bool Rehash)
                                servers_once++;
                }
        }
-       Log(LOG_DEBUG,
-           "Configuration: Operators=%ld, Servers=%d[%d], Channels=%ld",
+       LogDebug("Configuration: Operators=%ld, Servers=%d[%d], Channels=%ld",
            array_length(&Conf_Opers, sizeof(struct Conf_Oper)),
            servers, servers_once,
            array_length(&Conf_Channels, sizeof(struct Conf_Channel)));
-#endif
 
        return config_valid;
 }
@@ -2226,7 +2223,6 @@ va_dcl
                Log(Level, "%s", msg);
 }
 
-#ifdef DEBUG
 
 /**
  * Dump internal state of the "configuration module".
@@ -2236,11 +2232,11 @@ Conf_DebugDump(void)
 {
        int i;
 
-       Log(LOG_DEBUG, "Configured servers:");
+       LogDebug("Configured servers:");
        for (i = 0; i < MAX_SERVERS; i++) {
                if (! Conf_Server[i].name[0])
                        continue;
-               Log(LOG_DEBUG,
+               LogDebug(
                    " - %s: %s:%d, last=%ld, group=%d, flags=%d, conn=%d",
                    Conf_Server[i].name, Conf_Server[i].host,
                    Conf_Server[i].port, Conf_Server[i].lasttry,
@@ -2249,7 +2245,6 @@ Conf_DebugDump(void)
        }
 }
 
-#endif
 
 /**
  * Initialize server configuration structure to default values.