X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fconfigreader.h;h=f59fba389299e39862fe9ffdd05b97128b9ce867;hb=b512f1b9667ca0479d42e771082f3bc8d92c63a2;hp=e8c439933cef7fc7bf926b61b2b1038800303c74;hpb=d379dcab405bd4b0542e3c645a2de3c1a27832b8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index e8c439933..f59fba389 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -83,8 +83,7 @@ class CoreExport ConfigTag : public refcountbase
 	inline const std::vector<KeyVal>& getItems() const { return items; }
 
 	/** Create a new ConfigTag, giving access to the private KeyVal item list */
-	static ConfigTag* create(const std::string& Tag, const std::string& file, int line,
-		std::vector<KeyVal>*&items);
+	static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*& Items);
  private:
 	ConfigTag(const std::string& Tag, const std::string& file, int line);
 };
@@ -115,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
@@ -122,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
@@ -152,11 +153,6 @@ struct CommandLineConf
 	 */
 	bool writelog;
 
-	/** True if we have been told to run the testsuite from the commandline,
-	 * rather than entering the mainloop.
-	 */
-	bool TestSuite;
-
 	/** Saved argc from startup
 	 */
 	int argc;
@@ -303,57 +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;
-
-	/** The admin-configured /DIE password
-	 */
-	std::string diepass;
-
-	/** The admin-configured /RESTART password
-	 */
-	std::string restartpass;
-
-	/** The hash method for *BOTH* the die and restart passwords.
-	 */
-	std::string powerhash;
-
-	/** The quit prefix in use, or an empty string
-	 */
-	std::string PrefixQuit;
-
-	/** The quit suffix in use, or an empty string
-	 */
-	std::string SuffixQuit;
-
-	/** The fixed quit message in use, or an empty string
-	 */
-	std::string FixedQuit;
-
-	/** The part prefix in use, or an empty string
-	 */
-	std::string PrefixPart;
-
-	/** The part suffix in use, or an empty string
-	 */
-	std::string SuffixPart;
-
-	/** The fixed part message in use, or an empty string
-	 */
-	std::string FixedPart;
-
 	/** Pretend disabled commands don't exist.
 	 */
 	bool DisabledDontExist;
@@ -501,11 +446,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;