ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-28 11:50:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix DNSServer not being read on initial config read

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11884 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
danieldg 2009-10-17 03:54:34 +00:00
parent 8a13e4ebf7
commit 0c71b5c584
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/configreader.cpp
View File

@ -481,7 +481,6 @@ void ServerConfig::Fill()
ModPath = options->getString("moduledir", MOD_PATH); ModPath = options->getString("moduledir", MOD_PATH);
NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240); NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240);
MaxWhoResults = ConfValue("performance")->getInt("maxwho", 1024); MaxWhoResults = ConfValue("performance")->getInt("maxwho", 1024);
DNSServer = ConfValue("dns")->getString("server");
dns_timeout = ConfValue("dns")->getInt("timeout", 5); dns_timeout = ConfValue("dns")->getInt("timeout", 5);
DisabledCommands = ConfValue("disabled")->getString("commands", ""); DisabledCommands = ConfValue("disabled")->getString("commands", "");
DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant"); DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
@ -621,10 +620,13 @@ void ServerConfig::Read()
{ {
/* Load and parse the config file, if there are any errors then explode */ /* Load and parse the config file, if there are any errors then explode */
if (!this->DoInclude(ServerInstance->ConfigFileName, true)) valid = DoInclude(ServerInstance->ConfigFileName, true);
if (valid)
{ {
valid = false; ReadFile(MOTD, ConfValue("files")->getString("motd"));
return; ReadFile(RULES, ConfValue("files")->getString("rules"));
DNSServer = ConfValue("dns")->getString("server");
FindDNS(DNSServer);
} }
} }
@ -1379,10 +1381,6 @@ void ConfigReaderThread::Run()
{ {
Config = new ServerConfig; Config = new ServerConfig;
Config->Read(); Config->Read();
Config->ReadFile(Config->MOTD, Config->ConfValue("files")->getString("motd"));
Config->ReadFile(Config->RULES, Config->ConfValue("files")->getString("rules"));
FindDNS(Config->DNSServer);
done = true; done = true;
} }