X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigreader.h;h=57d7ab069741a1f68869183005b705a1a1ffabba;hb=e0e1becc2f9129203966e69b2919582c11ab86f7;hp=342743991cdece1ba40e9081601f61582c7ffc3d;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 342743991..57d7ab069 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -117,13 +117,10 @@ class ServerLimits
 	/** Maximum hostname length */
 	size_t MaxHost;
 
-	/** Creating the class initialises it to the defaults
-	 * as in 1.1's ./configure script. Reading other values
-	 * from the config will change these values.
+	/** Read all limits from a config tag. Limits which aren't specified in the tag are set to a default value.
+	 * @param tag Configuration tag to read the limits from
 	 */
-	ServerLimits() : NickMax(31), ChanMax(64), MaxModes(20), IdentMax(12),
-		MaxQuit(255), MaxTopic(307), MaxKick(255), MaxGecos(128), MaxAway(200),
-		MaxLine(512), MaxHost(64) { }
+	ServerLimits(ConfigTag* tag);
 };
 
 struct CommandLineConf
@@ -165,8 +162,9 @@ struct CommandLineConf
 class CoreExport OperInfo : public refcountbase
 {
  public:
-	std::set<std::string> AllowedOperCommands;
-	std::set<std::string> AllowedPrivs;
+	typedef insp::flat_set<std::string> PrivSet;
+	PrivSet AllowedOperCommands;
+	PrivSet AllowedPrivs;
 
 	/** Allowed user modes from oper classes. */
 	std::bitset<64> AllowedUserModes;
@@ -233,7 +231,7 @@ class CoreExport ServerConfig
 
 	/** Index of valid oper blocks and types
 	 */
-	typedef std::map<std::string, reference<OperInfo> > OperIndex;
+	typedef insp::flat_map<std::string, reference<OperInfo> > OperIndex;
 
 	/** Get a configuration tag
 	 * @param tag The name of the tag to get