Change the SQLutils and SQL providers to also use interfaces for proper unload order...

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 3c45f6bf991c6d31843902c124f2fdb72e301419..a8b76b182472bb4976d5fa7c571e2c9bbb8d20f4 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -131,9 +131,12 @@ void ServerConfig::Update005()
                        token_counter = 0;
                }
        }
-       char buf[MAXBUF];
-       snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
-       isupport.push_back(buf);
+       if (!line5.empty())
+       {
+               char buf[MAXBUF];
+               snprintf(buf, MAXBUF, "%s:are supported by this server", line5.c_str());
+               isupport.push_back(buf);
+       }
 }
 
 void ServerConfig::Send005(userrec* user)
@@ -579,43 +582,43 @@ void ServerConfig::Read(bool bail, userrec* user)
 
        /* These tags can occur ONCE or not at all */
        InitialConfig Values[] = {
-               {"options",     "softlimit",    MAXCLIENTS_S,                           new ValueContainerUInt (&this->SoftLimit),              DT_INTEGER, ValidateSoftLimit},
-               {"options",     "somaxconn",    itoa(SOMAXCONN, somax, 10),             new ValueContainerInt  (&this->MaxConn),                DT_INTEGER, ValidateMaxConn},
-               {"server",      "name",         "",                                     new ValueContainerChar (this->ServerName),              DT_CHARPTR, ValidateServerName},
-               {"server",      "description",  "Configure Me",                         new ValueContainerChar (this->ServerDesc),              DT_CHARPTR, NoValidation},
-               {"server",      "network",      "Network",                              new ValueContainerChar (this->Network),                 DT_CHARPTR, NoValidation},
-               {"admin",       "name",         "Miss Configured",                      new ValueContainerChar (this->AdminName),               DT_CHARPTR, NoValidation},
-               {"admin",       "email",        "Mis@configu.red",                      new ValueContainerChar (this->AdminEmail),              DT_CHARPTR, NoValidation},
-               {"admin",       "nick",         "Misconfigured",                        new ValueContainerChar (this->AdminNick),               DT_CHARPTR, NoValidation},
-               {"files",       "motd",         "",                                     new ValueContainerChar (this->motd),                    DT_CHARPTR, ValidateMotd},
-               {"files",       "rules",        "",                                     new ValueContainerChar (this->rules),                   DT_CHARPTR, ValidateRules},
-               {"power",       "diepass",      "",                                     new ValueContainerChar (this->diepass),                 DT_CHARPTR, NoValidation},      
-               {"power",       "pause",        "",                                     new ValueContainerInt  (&this->DieDelay),               DT_INTEGER, NoValidation},
-               {"power",       "restartpass",  "",                                     new ValueContainerChar (this->restartpass),             DT_CHARPTR, NoValidation},
-               {"options",     "prefixquit",   "",                                     new ValueContainerChar (this->PrefixQuit),              DT_CHARPTR, NoValidation},
-               {"options",     "loglevel",     "default",                              new ValueContainerChar (debug),                         DT_CHARPTR, ValidateLogLevel},
-               {"options",     "netbuffersize","10240",                                new ValueContainerInt  (&this->NetBufferSize),          DT_INTEGER, ValidateNetBufferSize},
-               {"options",     "maxwho",       "128",                                  new ValueContainerInt  (&this->MaxWhoResults),          DT_INTEGER, ValidateMaxWho},
-               {"options",     "allowhalfop",  "0",                                    new ValueContainerBool (&this->AllowHalfop),            DT_BOOLEAN, NoValidation},
-               {"dns",         "server",       "",                                     new ValueContainerChar (this->DNSServer),               DT_CHARPTR, ValidateDnsServer},
-               {"dns",         "timeout",      "5",                                    new ValueContainerInt  (&this->dns_timeout),            DT_INTEGER, NoValidation},
-               {"options",     "moduledir",    MOD_PATH,                               new ValueContainerChar (this->ModPath),                 DT_CHARPTR, NoValidation},
-               {"disabled",    "commands",     "",                                     new ValueContainerChar (this->DisabledCommands),        DT_CHARPTR, NoValidation},
-               {"options",     "userstats",    "",                                     new ValueContainerChar (this->UserStats),               DT_CHARPTR, NoValidation},
-               {"options",     "customversion","",                                     new ValueContainerChar (this->CustomVersion),           DT_CHARPTR, NoValidation},
-               {"options",     "hidesplits",   "0",                                    new ValueContainerBool (&this->HideSplits),             DT_BOOLEAN, NoValidation},
-               {"options",     "hidebans",     "0",                                    new ValueContainerBool (&this->HideBans),               DT_BOOLEAN, NoValidation},
-               {"options",     "hidewhois",    "",                                     new ValueContainerChar (this->HideWhoisServer),         DT_CHARPTR, NoValidation},
-               {"options",     "operspywhois", "0",                                    new ValueContainerBool (&this->OperSpyWhois),           DT_BOOLEAN, NoValidation},
-               {"options",     "nouserdns",    "0",                                    new ValueContainerBool (&this->NoUserDns),              DT_BOOLEAN, NoValidation},
-               {"options",     "syntaxhints",  "0",                                    new ValueContainerBool (&this->SyntaxHints),            DT_BOOLEAN, NoValidation},
-               {"options",     "cyclehosts",   "0",                                    new ValueContainerBool (&this->CycleHosts),             DT_BOOLEAN, NoValidation},
-               {"options",     "ircumsgprefix","0",                                    new ValueContainerBool (&this->UndernetMsgPrefix),      DT_BOOLEAN, NoValidation},
-               {"pid",         "file",         "",                                     new ValueContainerChar (this->PID),                     DT_CHARPTR, NoValidation},
-               {"whowas",      "groupsize",    "10",                                   new ValueContainerInt  (&this->WhoWasGroupSize),        DT_INTEGER, NoValidation},
-               {"whowas",      "maxgroups",    "10240",                                new ValueContainerInt  (&this->WhoWasMaxGroups),        DT_INTEGER, NoValidation},
-               {"whowas",      "maxkeep",      "3600",                                 new ValueContainerChar (maxkeep),                       DT_CHARPTR, ValidateWhoWas},
-               {"die",         "value",        "",                                     new ValueContainerChar (this->DieValue),                DT_CHARPTR, NoValidation},
+               {"options",     "softlimit",    MAXCLIENTS_S,           new ValueContainerUInt (&this->SoftLimit),              DT_INTEGER, ValidateSoftLimit},
+               {"options",     "somaxconn",    SOMAXCONN_S,            new ValueContainerInt  (&this->MaxConn),                DT_INTEGER, ValidateMaxConn},
+               {"server",      "name",         "",                     new ValueContainerChar (this->ServerName),              DT_CHARPTR, ValidateServerName},
+               {"server",      "description",  "Configure Me",         new ValueContainerChar (this->ServerDesc),              DT_CHARPTR, NoValidation},
+               {"server",      "network",      "Network",              new ValueContainerChar (this->Network),                 DT_CHARPTR, NoValidation},
+               {"admin",       "name",         "Miss Configured",      new ValueContainerChar (this->AdminName),               DT_CHARPTR, NoValidation},
+               {"admin",       "email",        "Mis@configu.red",      new ValueContainerChar (this->AdminEmail),              DT_CHARPTR, NoValidation},
+               {"admin",       "nick",         "Misconfigured",        new ValueContainerChar (this->AdminNick),               DT_CHARPTR, NoValidation},
+               {"files",       "motd",         "",                     new ValueContainerChar (this->motd),                    DT_CHARPTR, ValidateMotd},
+               {"files",       "rules",        "",                     new ValueContainerChar (this->rules),                   DT_CHARPTR, ValidateRules},
+               {"power",       "diepass",      "",                     new ValueContainerChar (this->diepass),                 DT_CHARPTR, NoValidation},      
+               {"power",       "pause",        "",                     new ValueContainerInt  (&this->DieDelay),               DT_INTEGER, NoValidation},
+               {"power",       "restartpass",  "",                     new ValueContainerChar (this->restartpass),             DT_CHARPTR, NoValidation},
+               {"options",     "prefixquit",   "",                     new ValueContainerChar (this->PrefixQuit),              DT_CHARPTR, NoValidation},
+               {"options",     "loglevel",     "default",              new ValueContainerChar (debug),                         DT_CHARPTR, ValidateLogLevel},
+               {"options",     "netbuffersize","10240",                new ValueContainerInt  (&this->NetBufferSize),          DT_INTEGER, ValidateNetBufferSize},
+               {"options",     "maxwho",       "128",                  new ValueContainerInt  (&this->MaxWhoResults),          DT_INTEGER, ValidateMaxWho},
+               {"options",     "allowhalfop",  "0",                    new ValueContainerBool (&this->AllowHalfop),            DT_BOOLEAN, NoValidation},
+               {"dns",         "server",       "",                     new ValueContainerChar (this->DNSServer),               DT_CHARPTR, ValidateDnsServer},
+               {"dns",         "timeout",      "5",                    new ValueContainerInt  (&this->dns_timeout),            DT_INTEGER, NoValidation},
+               {"options",     "moduledir",    MOD_PATH,               new ValueContainerChar (this->ModPath),                 DT_CHARPTR, NoValidation},
+               {"disabled",    "commands",     "",                     new ValueContainerChar (this->DisabledCommands),        DT_CHARPTR, NoValidation},
+               {"options",     "userstats",    "",                     new ValueContainerChar (this->UserStats),               DT_CHARPTR, NoValidation},
+               {"options",     "customversion","",                     new ValueContainerChar (this->CustomVersion),           DT_CHARPTR, NoValidation},
+               {"options",     "hidesplits",   "0",                    new ValueContainerBool (&this->HideSplits),             DT_BOOLEAN, NoValidation},
+               {"options",     "hidebans",     "0",                    new ValueContainerBool (&this->HideBans),               DT_BOOLEAN, NoValidation},
+               {"options",     "hidewhois",    "",                     new ValueContainerChar (this->HideWhoisServer),         DT_CHARPTR, NoValidation},
+               {"options",     "operspywhois", "0",                    new ValueContainerBool (&this->OperSpyWhois),           DT_BOOLEAN, NoValidation},
+               {"options",     "nouserdns",    "0",                    new ValueContainerBool (&this->NoUserDns),              DT_BOOLEAN, NoValidation},
+               {"options",     "syntaxhints",  "0",                    new ValueContainerBool (&this->SyntaxHints),            DT_BOOLEAN, NoValidation},
+               {"options",     "cyclehosts",   "0",                    new ValueContainerBool (&this->CycleHosts),             DT_BOOLEAN, NoValidation},
+               {"options",     "ircumsgprefix","0",                    new ValueContainerBool (&this->UndernetMsgPrefix),      DT_BOOLEAN, NoValidation},
+               {"pid",         "file",         "",                     new ValueContainerChar (this->PID),                     DT_CHARPTR, NoValidation},
+               {"whowas",      "groupsize",    "10",                   new ValueContainerInt  (&this->WhoWasGroupSize),        DT_INTEGER, NoValidation},
+               {"whowas",      "maxgroups",    "10240",                new ValueContainerInt  (&this->WhoWasMaxGroups),        DT_INTEGER, NoValidation},
+               {"whowas",      "maxkeep",      "3600",                 new ValueContainerChar (maxkeep),                       DT_CHARPTR, ValidateWhoWas},
+               {"die",         "value",        "",                     new ValueContainerChar (this->DieValue),                DT_CHARPTR, NoValidation},
                {NULL}
        };