Fix parallel compilation issue when building lexer/parser.

[solanum.git] / src / newconf.c

diff --git a/src/newconf.c b/src/newconf.c
index 95013c53601f7d7b7b054bd22eaef693d5423867..ccb1c1510d431a4b4a38ad084eb58bbc166aa1e3 100644 (file)
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -260,6 +260,25 @@ conf_set_serverinfo_vhost6(void *data)
 #endif
 }
 
+static void
+conf_set_serverinfo_nicklen(void *data)
+{
+       ConfigFileEntry.nicklen = (*(unsigned int *) data) + 1;
+
+       if (ConfigFileEntry.nicklen > NICKLEN)
+       {
+               conf_report_error("Warning -- ignoring serverinfo::nicklen -- provided nicklen (%u) is greater than allowed nicklen (%u)",
+                                 ConfigFileEntry.nicklen - 1, NICKLEN - 1);
+               ConfigFileEntry.nicklen = NICKLEN;
+       }
+       else if (ConfigFileEntry.nicklen < 9 + 1)
+       {
+               conf_report_error("Warning -- serverinfo::nicklen is too low (%u) -- forcing 9",
+                                 ConfigFileEntry.nicklen);
+               ConfigFileEntry.nicklen = 9 + 1;
+       }
+}
+
 static void
 conf_set_modules_module(void *data)
 {
@@ -2085,6 +2104,8 @@ static struct ConfEntry conf_serverinfo_table[] =
 
        { "default_max_clients",CF_INT,     NULL, 0, &ServerInfo.default_max_clients },
 
+       { "nicklen",            CF_INT,     conf_set_serverinfo_nicklen, 0, NULL },
+
        { "\0", 0, NULL, 0, NULL }
 };
 
@@ -2256,6 +2277,8 @@ static struct ConfEntry conf_general_table[] =
        { "client_flood_burst_max",     CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_burst_max      },
        { "client_flood_message_num",   CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_message_num    },
        { "client_flood_message_time",  CF_INT,   NULL, 0, &ConfigFileEntry.client_flood_message_time   },
+       { "max_ratelimit_tokens",       CF_INT,   NULL, 0, &ConfigFileEntry.max_ratelimit_tokens        },
+       { "away_interval",              CF_INT,   NULL, 0, &ConfigFileEntry.away_interval               },
        { "\0",                 0,        NULL, 0, NULL }
 };