X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=include%2Fconfigreader.h;h=d8fa3b418075c7d2977167aa958a18074998e582;hb=2dca25b85b6e25e28fe8f1bdc705fda77c6c28e4;hp=3759e909f9855463ee8d5762511ffc2206fdac33;hpb=8509727e16f1d9ce6c9719c8d62c7715d3699858;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/configreader.h b/include/configreader.h
index 3759e909f..d8fa3b418 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -68,10 +68,8 @@ class ValueItem
 	/** Initialize with a bool */
 	ValueItem(bool value);
 	/** Initialize with a char pointer */
-	ValueItem(char* value);
+	ValueItem(const char* value);
 	/** Change value to a char pointer */
-	void Set(char* value);
-	/** Change value to a const char pointer */
 	void Set(const char* val);
 	/** Change value to an int */
 	void Set(int value);
@@ -166,11 +164,11 @@ typedef bool (*MultiNotify)(ServerConfig* conf, const char*);
 struct InitialConfig
 {
 	/** Tag name */
-	char* tag;
+	const char* tag;
 	/** Value name */
-	char* value;
+	const char* value;
 	/** Default, if not defined */
-	char* default_value;
+	const char* default_value;
 	/** Value containers */
 	ValueContainerBase* val;
 	/** Data types */
@@ -187,9 +185,9 @@ struct MultiConfig
 	/** Tag name */
 	const char*	tag;
 	/** One or more items within tag */
-	char*		items[18];
+	const char*	items[18];
 	/** One or more defaults for items within tags */
-	char*		items_default[18];
+	const char* items_default[18];
 	/** One or more data types */
 	int		datatype[18];
 	/** Initialization function */
@@ -240,7 +238,7 @@ class CoreExport ServerConfig : public Extensible
 
 	/** Check that there is only one of each configuration item
 	 */
-	bool CheckOnce(char* tag);
+	bool CheckOnce(const char* tag);
 
  public:
 
@@ -263,7 +261,7 @@ class CoreExport ServerConfig : public Extensible
 
 	InspIRCd* GetInstance();
 
-	void DoDownloads();
+	int DoDownloads();
 	  
   	/** This holds all the information in the config file,
 	 * it's indexed by tag name to a vector of key/values.
@@ -429,10 +427,6 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	bool AllowHalfop;
 
-	/** If this value is true, users are allowed to devoice themselves.
-	 */
-	bool AllowDevoiceSelf;
-
 	/** If this is set to true, then mode lists (e.g
 	 * MODE #chan b) are hidden from unprivileged
 	 * users.
@@ -635,6 +629,11 @@ class CoreExport ServerConfig : public Extensible
 	 */
 	char sid[MAXBUF];
 
+	/** True if we have been told to run the testsuite from the commandline,
+	 * rather than entering the mainloop.
+	 */
+	bool TestSuite;
+
 	/** Construct a new ServerConfig
 	 */
 	ServerConfig(InspIRCd* Instance);