Fix the problems GreenReaper found with the windows select engine, this has never...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 81ae1e6c0b1a83a795273859525303214df0395e..2b7555a01a4b4f221509c6aaa0294fe36016850f 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -344,6 +344,7 @@ bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem
                std::string moo = std::string(data.GetString()).append(".");
                data.Set(moo.c_str());
        }
+       conf->ValidateHostname(data.GetString(), "server", "name");
        return true;
 }
 
@@ -762,11 +763,25 @@ void ServerConfig::Read(bool bail, User* user)
        static const char* Once[] = { "server", "admin", "files", "power", "options", NULL };
 
        Deprecated ChangedConfig[] = {
-               {"options",     "hidelinks",    "has been moved to <security:hidelinks> as of 1.2a3"},
-               {"options",     "hidewhois",    "has been moved to <security:hidewhois> as of 1.2a3"},
-               {"options",     "nouserdns",    "has been moved to <performance:nouserdns> as of 1.2a3"},
-               {"options",     "maxwho",       "has been moved to <performance:maxwho> as of 1.2a3"},
-               {NULL,          NULL,           NULL}
+               {"options",     "hidelinks",            "has been moved to <security:hidelinks> as of 1.2a3"},
+               {"options",     "hidewhois",            "has been moved to <security:hidewhois> as of 1.2a3"},
+               {"options",     "userstats",            "has been moved to <security:userstats> as of 1.2a3"},
+               {"options",     "customversion",        "has been moved to <security:customversion> as of 1.2a3"},
+               {"options",     "hidesplits",           "has been moved to <security:hidesplits> as of 1.2a3"},
+               {"options",     "hidebans",             "has been moved to <security:hidebans> as of 1.2a3"},
+               {"options",     "hidekills",            "has been moved to <security:hidekills> as of 1.2a3"},
+               {"options",     "operspywhois",         "has been moved to <security:operspywhois> as of 1.2a3"},
+               {"options",     "announceinvites",      "has been moved to <security:announceinvites> as of 1.2a3"},
+               {"options",     "hidemodes",            "has been moved to <security:hidemodes> as of 1.2a3"},
+               {"options",     "maxtargets",           "has been moved to <security:maxtargets> as of 1.2a3"},
+               {"options",     "nouserdns",            "has been moved to <performance:nouserdns> as of 1.2a3"},
+               {"options",     "maxwho",               "has been moved to <performance:maxwho> as of 1.2a3"},
+               {"options",     "softlimit",            "has been moved to <performance:softlimit> as of 1.2a3"},
+               {"options",     "somaxconn",            "has been moved to <performance:somaxconn> as of 1.2a3"},
+               {"options",     "netbuffersize",        "has been moved to <performance:netbuffersize> as of 1.2a3"},
+               {"options",     "maxwho",               "has been moved to <performance:maxwho> as of 1.2a3"},
+               {"options",     "loglevel",             "1.2 does not use the loglevel value. Please define <log> tags instead."},
+               {NULL,          NULL,                   NULL}
        };
 
        /* These tags can occur ONCE or not at all */