Whoops, make /stats s work

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index e0e249963f8ed55fb27d2d8d0bbb64d39ddfb3d6..b8719fcd85b1e149ff6ade231a3f66d1ec57c396 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -518,7 +518,7 @@ void ServerConfig::Read(bool bail, userrec* user)
        std::ostringstream errstr;      /* String stream containing the error output */
 
        /* These tags MUST occur and must ONLY occur once in the config file */
-       static char* Once[] = { "server", "admin", "files", "power", "options", "pid", NULL };
+       static char* Once[] = { "server", "admin", "files", "power", "options", NULL };
 
        /* These tags can occur ONCE or not at all */
        static InitialConfig Values[] = {
@@ -533,7 +533,7 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"files",               "motd",                         &this->motd,                    DT_CHARPTR, ValidateMotd},
                {"files",               "rules",                        &this->rules,                   DT_CHARPTR, ValidateRules},
                {"power",               "diepass",                      &this->diepass,                 DT_CHARPTR, NoValidation},      
-               {"power",               "pauseval",                     &this->DieDelay,                DT_INTEGER, NoValidation},
+               {"power",               "pause",                        &this->DieDelay,                DT_INTEGER, NoValidation},
                {"power",               "restartpass",                  &this->restartpass,             DT_CHARPTR, NoValidation},
                {"options",             "prefixquit",                   &this->PrefixQuit,              DT_CHARPTR, NoValidation},
                {"die",                 "value",                        &this->DieValue,                DT_CHARPTR, NoValidation},
@@ -771,7 +771,8 @@ void ServerConfig::Read(bool bail, userrec* user)
         */
        if (!bail)
        {
-               ServerInstance->stats->BoundPortCount = ServerInstance->BindPorts(false);
+               int found_ports;
+               ServerInstance->stats->BoundPortCount = ServerInstance->BindPorts(false, found_ports);
 
                if (!removed_modules.empty())
                        for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
@@ -1279,7 +1280,7 @@ bool ServerConfig::ReadFile(file_cache &F, const char* fname)
                if((pos = confpath.find("/inspircd.conf")) != std::string::npos)
                {
                        /* Leaves us with just the path */
-                       std::string newfile = confpath.substr(0, pos) + std::string("/") + newfile;
+                       std::string newfile = confpath.substr(0, pos) + std::string("/") + fname;
                        file =  fopen(newfile.c_str(), "r");
                        
                }