Add support for CAP to this via multi-prefix. NOTE, the OnNamesList for this and...

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 3e7ae9cdfd100c4b3b4714090930410d67fa2676..8a769ceb1d067a22cb29ae2a1e6517c32f9479e5 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -251,7 +251,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
         * on which they want, and we make sure our module is *at least* before or after
         * the first or last of this subset, depending again on the type of priority.
         */
-       size_t swap_pos;
+       size_t swap_pos = 0;
        size_t source = 0;
        bool swap = true;
        bool found = false;
@@ -823,11 +823,8 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
        this->data = new ConfigDataHash;
        this->privatehash = true;
        this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-       for (int pass = 0; pass < 2; pass++)
-       {
-               /*** XXX: Can return a 'not ready yet!' code! */
-               this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog, pass);
-       }
+       /*** XXX: This might block! */
+       this->readerror = ServerInstance->Config->DoInclude(*this->data, filename, *this->errorlog);
        if (!this->readerror)
                this->error = CONF_FILE_NOT_FOUND;
 }