w00t br0ked it! :p

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index dea6a7a7d9bee3df3554988c0df8d5535fcc682a..f083f7895c2cdd8380fc467709a5ca3478d2beb2 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -335,7 +335,7 @@ bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &
                std::string nameserver;
                // attempt to look up their nameserver from /etc/resolv.conf
                conf->GetInstance()->Log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
-               ifstream resolv("/etc/resolv.conf");
+               std::ifstream resolv("/etc/resolv.conf");
                bool found_server = false;
 
                if (resolv.is_open())
@@ -830,7 +830,6 @@ void ServerConfig::Read(bool bail, User* user, int pass)
                {"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},
-               {"options",     "allowdevoiceself",     "0",                    new ValueContainerBool (&this->AllowDevoiceSelf),               DT_BOOLEAN,  NoValidation},
                {"dns",         "server",       "",                     new ValueContainerChar (this->DNSServer),               DT_IPADDRESS,DNSServerValidator},
                {"dns",         "timeout",      "5",                    new ValueContainerInt  (&this->dns_timeout),            DT_INTEGER,  NoValidation},
                {"options",     "moduledir",    MOD_PATH,               new ValueContainerChar (this->ModPath),                 DT_CHARPTR,  NoValidation},