X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=ce03f1d9eb62d0faf85d7ee703cdeb42b9e7136d;hb=f4041a13c3894e282fb34010f3373d1950136a8c;hp=52d349f5cac46166b1e32f59c1649336955bea3d;hpb=8cb20e354533fbec24aafd4e61ff6fa69b434aa2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 52d349f5c..ce03f1d9e 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -108,6 +108,7 @@ static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::str
 			throw CoreException("<"+tag+":"+key+"> missing at " + ctag->getTagLocation());
 		std::string reason = ctag->getString("reason", "<Config>");
 		XLine* xl = make->Generate(ServerInstance->Time(), 0, "<Config>", reason, mask);
+		xl->from_config = true;
 		if (!ServerInstance->XLines->AddLine(xl, NULL))
 			delete xl;
 	}
@@ -333,35 +334,6 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 	}
 }
 
-/** Represents a deprecated configuration tag.
- */
-struct DeprecatedConfig
-{
-	/** Tag name. */
-	std::string tag;
-
-	/** Attribute key. */
-	std::string key;
-
-	/** Attribute value. */
-	std::string value;
-
-	/** Reason for deprecation. */
-	std::string reason;
-};
-
-static const DeprecatedConfig ChangedConfig[] = {
-	{ "bind",        "transport",   "",                 "has been moved to <bind:ssl> as of 2.0" },
-	{ "die",         "value",       "",                 "you need to reread your config" },
-	{ "gnutls",      "starttls",    "",                 "has been replaced with m_starttls as of 3.0" },
-	{ "link",        "autoconnect", "",                 "2.0+ does not use this attribute - define <autoconnect> tags instead" },
-	{ "link",        "transport",   "",                 "has been moved to <link:ssl> as of 2.0" },
-	{ "module",      "name",        "m_chanprotect.so", "has been replaced with m_customprefix as of 3.0" },
-	{ "module",      "name",        "m_halfop.so",      "has been replaced with m_customprefix as of 3.0" },
-	{ "options",     "cyclehosts",  "",                 "has been replaced with m_hostcycle as of 3.0" },
-	{ "performance", "nouserdns",   "",                 "has been moved to <connect:resolvehostnames> as of 3.0" }
-};
-
 void ServerConfig::Fill()
 {
 	ConfigTag* options = ConfValue("options");
@@ -401,21 +373,16 @@ void ServerConfig::Fill()
 	SoftLimit = ConfValue("performance")->getUInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10);
 	CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
 	MaxConn = ConfValue("performance")->getUInt("somaxconn", SOMAXCONN);
+	TimeSkipWarn = ConfValue("performance")->getDuration("timeskipwarn", 2, 0, 30);
 	XLineMessage = options->getString("xlinemessage", options->getString("moronbanner", "You're banned!"));
 	ServerDesc = server->getString("description", "Configure Me");
 	Network = server->getString("network", "Network");
 	NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
 	DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
-	UserStats = security->getString("userstats");
 	CustomVersion = security->getString("customversion");
-	HideSplits = security->getBool("hidesplits");
 	HideBans = security->getBool("hidebans");
 	HideServer = security->getString("hideserver", security->getString("hidewhois"));
-	HideKillsServer = security->getString("hidekills");
-	HideULineKills = security->getBool("hideulinekills");
-	GenericOper = security->getBool("genericoper");
 	SyntaxHints = options->getBool("syntaxhints");
-	CycleHostsFromUser = options->getBool("cyclehostsfromuser");
 	FullHostInTopic = options->getBool("hostintopic");
 	MaxTargets = security->getUInt("maxtargets", 20, 1, 31);
 	DefaultModes = options->getString("defaultmodes", "not");
@@ -447,6 +414,7 @@ void ServerConfig::Fill()
 			SocketEngine::Close(socktest);
 	}
 
+	ServerInstance->XLines->ClearConfigLines();
 	ReadXLine(this, "badip", "ipmask", ServerInstance->XLines->GetFactory("Z"));
 	ReadXLine(this, "badnick", "nick", ServerInstance->XLines->GetFactory("Q"));
 	ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
@@ -517,26 +485,16 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	/* The stuff in here may throw CoreException, be sure we're in a position to catch it. */
 	try
 	{
-		for (unsigned long index = 0; index * sizeof(DeprecatedConfig) < sizeof(ChangedConfig); index++)
+		// Ensure the user has actually edited ther config.
+		ConfigTagList dietags = ConfTags("die");
+		if (dietags.first != dietags.second)
 		{
-			std::string value;
-			ConfigTagList tags = ConfTags(ChangedConfig[index].tag);
-			for(ConfigIter i = tags.first; i != tags.second; ++i)
+			errstr << "Your configuration has not been edited correctly!" << std::endl;
+			for (ConfigIter iter = dietags.first; iter != dietags.second; ++iter)
 			{
-				if (i->second->readString(ChangedConfig[index].key, value, true)
-					&& (ChangedConfig[index].value.empty() || value == ChangedConfig[index].value))
-				{
-					errstr << "Your configuration contains a deprecated value: <"  << ChangedConfig[index].tag;
-					if (ChangedConfig[index].value.empty())
-					{
-						errstr << ':' << ChangedConfig[index].key;
-					}
-					else
-					{
-						errstr << ' ' << ChangedConfig[index].key << "=\"" << ChangedConfig[index].value << "\"";
-					}
-					errstr << "> - " << ChangedConfig[index].reason << " (at " << i->second->getTagLocation() << ")" << std::endl;
-				}
+				ConfigTag* tag = iter->second;
+				const std::string reason = tag->getString("reason", "You left a <die> tag in your config", 1);
+				errstr << reason <<  " (at " << tag->getTagLocation() << ")" << std::endl;
 			}
 		}
 
@@ -608,16 +566,6 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 	errstr.clear();
 	errstr.str(std::string());
 
-	// Re-parse our MOTD and RULES files for colors -- Justasic
-	for (ClassVector::const_iterator it = this->Classes.begin(), it_end = this->Classes.end(); it != it_end; ++it)
-	{
-		ConfigTag *tag = (*it)->config;
-
-		ConfigFileCache::iterator file = this->Files.find(tag->getString("motd", "motd"));
-		if (file != this->Files.end())
-			InspIRCd::ProcessColors(file->second);
-	}
-
 	/* No old configuration -> initial boot, nothing more to do here */
 	if (!old)
 	{