X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=f3137ec0a982d1320be1856de07d62fd29e3c0f0;hb=662364f8551b3db2a3cbc0000f2d3eec091d8e07;hp=ec99326588d10cb6b7b8456b9eb06ba8003b54ae;hpb=f2db4b743f0df9b9e588979fd0fcf2815e54af44;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index ec9932658..f3137ec0a 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -216,10 +216,10 @@ class CoreExport ServerConfig
 		std::string Module;
 
 		ServerPaths()
-			: Config(CONFIG_PATH)
-			, Data(DATA_PATH)
-			, Log(LOG_PATH)
-			, Module(MOD_PATH) { }
+			: Config(INSPIRCD_CONFIG_PATH)
+			, Data(INSPIRCD_DATA_PATH)
+			, Log(INSPIRCD_LOG_PATH)
+			, Module(INSPIRCD_MODULE_PATH) { }
 
 		std::string PrependConfig(const std::string& fn) const { return FileSystem::ExpandPath(Config, fn); }
 		std::string PrependData(const std::string& fn) const { return FileSystem::ExpandPath(Data, fn); }
@@ -227,6 +227,14 @@ class CoreExport ServerConfig
 		std::string PrependModule(const std::string& fn) const { return FileSystem::ExpandPath(Module, fn); }
 	};
 
+	/** Holds a complete list of all connect blocks
+	 */
+	typedef std::vector<reference<ConnectClass> > ClassVector;
+
+	/** Index of valid oper blocks and types
+	 */
+	typedef std::map<std::string, reference<OperInfo> > OperIndex;
+
 	/** Get a configuration tag
 	 * @param tag The name of the tag to get
 	 */
@@ -446,11 +454,11 @@ class CoreExport ServerConfig
 	 */
 	OperIndex OperTypes;
 
-	/** Max channels per user
+	/** Default value for <connect:maxchans>, deprecated in 2.2
 	 */
 	unsigned int MaxChans;
 
-	/** Oper max channels per user
+	/** Default value for <oper:maxchans>, deprecated in 2.2
 	 */
 	unsigned int OperMaxChans;