Change allocation of InspIRCd::Timers to be physically part of the object containing it

[user/henk/code/inspircd.git] / include / configreader.h

diff --git a/include/configreader.h b/include/configreader.h
index fd6452b31bed41f5eb082c061c154dc4d2e06186..ec99326588d10cb6b7b8456b9eb06ba8003b54ae 100644 (file)
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -114,6 +114,8 @@ class ServerLimits
        size_t MaxAway;
        /** Maximum line length */
        size_t MaxLine;
+       /** Maximum hostname length */
+       size_t MaxHost;
 
        /** Creating the class initialises it to the defaults
         * as in 1.1's ./configure script. Reading other values
@@ -121,7 +123,7 @@ class ServerLimits
         */
        ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
                MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
-               MaxLine(512) { }
+               MaxLine(512), MaxHost(64) { }
 };
 
 struct CommandLineConf
@@ -297,21 +299,6 @@ class CoreExport ServerConfig
         */
        std::string ServerDesc;
 
-       /** Holds the admin's name, for output in
-        * the /ADMIN command.
-        */
-       std::string AdminName;
-
-       /** Holds the email address of the admin,
-        * for output in the /ADMIN command.
-        */
-       std::string AdminEmail;
-
-       /** Holds the admin's nickname, for output
-        * in the /ADMIN command
-        */
-       std::string AdminNick;
-
        /** Pretend disabled commands don't exist.
         */
        bool DisabledDontExist;