X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=2b7555a01a4b4f221509c6aaa0294fe36016850f;hb=73eb66f2b1c82f9e1d1a24093aa4a305c2cfe2e7;hp=a5ca8bfcee27b4cabd10fc1edad2c0fa9c5df7c3;hpb=f8b8a643c07f9c5c7858bc97f6da1208f87935bd;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index a5ca8bfce..2b7555a01 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -344,6 +344,7 @@ bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem
 		std::string moo = std::string(data.GetString()).append(".");
 		data.Set(moo.c_str());
 	}
+	conf->ValidateHostname(data.GetString(), "server", "name");
 	return true;
 }
 
@@ -761,10 +762,32 @@ void ServerConfig::Read(bool bail, User* user)
 	/* These tags MUST occur and must ONLY occur once in the config file */
 	static const char* Once[] = { "server", "admin", "files", "power", "options", NULL };
 
+	Deprecated ChangedConfig[] = {
+		{"options",	"hidelinks",		"has been moved to <security:hidelinks> as of 1.2a3"},
+		{"options",	"hidewhois",		"has been moved to <security:hidewhois> as of 1.2a3"},
+		{"options",     "userstats",		"has been moved to <security:userstats> as of 1.2a3"},
+		{"options",     "customversion",	"has been moved to <security:customversion> as of 1.2a3"},
+		{"options",     "hidesplits",		"has been moved to <security:hidesplits> as of 1.2a3"},
+		{"options",     "hidebans",		"has been moved to <security:hidebans> as of 1.2a3"},
+		{"options",     "hidekills",		"has been moved to <security:hidekills> as of 1.2a3"},
+		{"options",     "operspywhois",		"has been moved to <security:operspywhois> as of 1.2a3"},
+		{"options",     "announceinvites",	"has been moved to <security:announceinvites> as of 1.2a3"},
+		{"options",     "hidemodes",		"has been moved to <security:hidemodes> as of 1.2a3"},
+		{"options",     "maxtargets",		"has been moved to <security:maxtargets> as of 1.2a3"},
+		{"options",	"nouserdns",		"has been moved to <performance:nouserdns> as of 1.2a3"},
+		{"options",	"maxwho",		"has been moved to <performance:maxwho> as of 1.2a3"},
+		{"options",	"softlimit",		"has been moved to <performance:softlimit> as of 1.2a3"},
+		{"options",     "somaxconn",		"has been moved to <performance:somaxconn> as of 1.2a3"},
+		{"options",     "netbuffersize",	"has been moved to <performance:netbuffersize> as of 1.2a3"},
+		{"options",     "maxwho",		"has been moved to <performance:maxwho> as of 1.2a3"},
+		{"options",	"loglevel",		"1.2 does not use the loglevel value. Please define <log> tags instead."},
+		{NULL,		NULL,			NULL}
+	};
+
 	/* These tags can occur ONCE or not at all */
 	InitialConfig Values[] = {
-		{"options",	"softlimit",	"0",			new ValueContainerUInt (&this->SoftLimit),		DT_INTEGER,  ValidateSoftLimit},
-		{"options",	"somaxconn",	SOMAXCONN_S,		new ValueContainerInt  (&this->MaxConn),		DT_INTEGER,  ValidateMaxConn},
+		{"performance",	"softlimit",	"0",			new ValueContainerUInt (&this->SoftLimit),		DT_INTEGER,  ValidateSoftLimit},
+		{"performance",	"somaxconn",	SOMAXCONN_S,		new ValueContainerInt  (&this->MaxConn),		DT_INTEGER,  ValidateMaxConn},
 		{"options",	"moronbanner",	"Youre banned!",	new ValueContainerChar (this->MoronBanner),		DT_CHARPTR,  NoValidation},
 		{"server",	"name",		"",			new ValueContainerChar (this->ServerName),		DT_HOSTNAME|DT_BOOTONLY, ValidateServerName},
 		{"server",	"description",	"Configure Me",		new ValueContainerChar (this->ServerDesc),		DT_CHARPTR,  NoValidation},
@@ -785,8 +808,8 @@ void ServerConfig::Read(bool bail, User* user)
 		{"options",	"prefixpart",	"",			new ValueContainerChar (this->PrefixPart),		DT_CHARPTR,  NoValidation},
 		{"options",	"suffixpart",	"",			new ValueContainerChar (this->SuffixPart),		DT_CHARPTR,  NoValidation},
 		{"options",	"fixedpart",	"",			new ValueContainerChar (this->FixedPart),		DT_CHARPTR,  NoValidation},
-		{"options",	"netbuffersize","10240",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER,  ValidateNetBufferSize},
-		{"options",	"maxwho",	"128",			new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER,  ValidateMaxWho},
+		{"performance",	"netbuffersize","10240",		new ValueContainerInt  (&this->NetBufferSize),		DT_INTEGER,  ValidateNetBufferSize},
+		{"performance",	"maxwho",	"128",			new ValueContainerInt  (&this->MaxWhoResults),		DT_INTEGER,  ValidateMaxWho},
 		{"options",	"allowhalfop",	"0",			new ValueContainerBool (&this->AllowHalfop),		DT_BOOLEAN,  NoValidation},
 		{"dns",		"server",	"",			new ValueContainerChar (this->DNSServer),		DT_IPADDRESS,DNSServerValidator},
 		{"dns",		"timeout",	"5",			new ValueContainerInt  (&this->dns_timeout),		DT_INTEGER,  NoValidation},
@@ -799,7 +822,7 @@ void ServerConfig::Read(bool bail, User* user)
 		{"security",	"hidewhois",	"",			new ValueContainerChar (this->HideWhoisServer),		DT_NOSPACES, NoValidation},
 		{"security",	"hidekills",	"",			new ValueContainerChar (this->HideKillsServer),		DT_NOSPACES,  NoValidation},
 		{"security",	"operspywhois",	"0",			new ValueContainerBool (&this->OperSpyWhois),		DT_BOOLEAN,  NoValidation},
-		{"options",	"nouserdns",	"0",			new ValueContainerBool (&this->NoUserDns),		DT_BOOLEAN,  NoValidation},
+		{"performance",	"nouserdns",	"0",			new ValueContainerBool (&this->NoUserDns),		DT_BOOLEAN,  NoValidation},
 		{"options",	"syntaxhints",	"0",			new ValueContainerBool (&this->SyntaxHints),		DT_BOOLEAN,  NoValidation},
 		{"options",	"cyclehosts",	"0",			new ValueContainerBool (&this->CycleHosts),		DT_BOOLEAN,  NoValidation},
 		{"options",	"ircumsgprefix","0",			new ValueContainerBool (&this->UndernetMsgPrefix),	DT_BOOLEAN,  NoValidation},
@@ -921,6 +944,16 @@ void ServerConfig::Read(bool bail, User* user)
 			if (!CheckOnce(Once[Index], newconfig))
 				return;
 
+		for (int Index = 0; ChangedConfig[Index].tag; Index++)
+		{
+			char item[MAXBUF];
+			*item = 0;
+			if (ConfValue(newconfig, ChangedConfig[Index].tag, ChangedConfig[Index].value, "", 0, item, MAXBUF, true) || *item)
+				throw CoreException(std::string("Your configuration contains a deprecated value: <") + ChangedConfig[Index].tag + ":" + ChangedConfig[Index].value + "> - " + ChangedConfig[Index].reason);
+			else
+				ServerInstance->Logs->Log("CONFIG",DEBUG,"Deprecated item <%s:%s> does not exist, good.", ChangedConfig[Index].tag, ChangedConfig[Index].value);
+		}
+
 		/* Read the values of all the tags which occur once or not at all, and call their callbacks.
 		 */
 		for (int Index = 0; Values[Index].tag; Index++)
@@ -1709,7 +1742,7 @@ bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, con
 			return true;
 		}
 	}
-	else if(pos == 0)
+	else if (pos == 0)
 	{
 		if (!default_value.empty())
 		{