X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;h=0318dd602cb9f071dd9ca5a09369117046e6f23e;hb=66ecf04088b747c00e7fdf8380fbece7848018be;hp=ce03f1d9eb62d0faf85d7ee703cdeb42b9e7136d;hpb=372c5c94964263ba6c1f2f44079aac3aff448225;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index ce03f1d9e..0318dd602 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -72,33 +72,10 @@ ServerConfig::~ServerConfig()
 	delete EmptyTag;
 }
 
-bool ServerConfig::ApplyDisabledCommands()
-{
-	// Enable everything first.
-	const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
-	for (CommandParser::CommandMap::const_iterator x = commands.begin(); x != commands.end(); ++x)
-		x->second->Disable(false);
-
-	// Now disable the commands specified in the config.
-	std::string command;
-	irc::spacesepstream commandlist(ConfValue("disabled")->getString("commands"));
-	while (commandlist.GetToken(command))
-	{
-		Command* handler = ServerInstance->Parser.GetHandler(command);
-		if (!handler)
-		{
-			ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "Unable to disable the %s command as it does not exist!", command.c_str());
-			continue;
-		}
-
-		ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "The %s command has been disabled", command.c_str());
-		handler->Disable(true);
-	}
-	return true;
-}
-
 static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::string& key, XLineFactory* make)
 {
+	insp::flat_set<std::string> configlines;
+
 	ConfigTagList tags = conf->ConfTags(tag);
 	for(ConfigIter i = tags.first; i != tags.second; ++i)
 	{
@@ -109,9 +86,12 @@ static void ReadXLine(ServerConfig* conf, const std::string& tag, const std::str
 		std::string reason = ctag->getString("reason", "<Config>");
 		XLine* xl = make->Generate(ServerInstance->Time(), 0, "<Config>", reason, mask);
 		xl->from_config = true;
+		configlines.insert(xl->Displayable());
 		if (!ServerInstance->XLines->AddLine(xl, NULL))
 			delete xl;
 	}
+
+	ServerInstance->XLines->ExpireRemovedConfigLines(make->GetType(), configlines);
 }
 
 typedef std::map<std::string, ConfigTag*> LocalIndex;
@@ -334,6 +314,23 @@ void ServerConfig::CrossCheckConnectBlocks(ServerConfig* current)
 	}
 }
 
+static std::string GetServerName()
+{
+#ifndef _WIN32
+	char hostname[256];
+	if (gethostname(hostname, sizeof(hostname)) == 0)
+	{
+		std::string name(hostname);
+		if (name.find('.') == std::string::npos)
+			name.push_back('.');
+
+		if (name.length() <= ServerInstance->Config->Limits.MaxHost && InspIRCd::IsHost(name))
+			return name;
+	}
+#endif
+	return "irc.example.com";
+}
+
 void ServerConfig::Fill()
 {
 	ConfigTag* options = ConfValue("options");
@@ -341,7 +338,7 @@ void ServerConfig::Fill()
 	ConfigTag* server = ConfValue("server");
 	if (sid.empty())
 	{
-		ServerName = server->getString("name", "irc.example.com", InspIRCd::IsHost);
+		ServerName = server->getString("name", GetServerName(), InspIRCd::IsHost);
 
 		sid = server->getString("id");
 		if (!sid.empty() && !InspIRCd::IsSID(sid))
@@ -378,7 +375,6 @@ void ServerConfig::Fill()
 	ServerDesc = server->getString("description", "Configure Me");
 	Network = server->getString("network", "Network");
 	NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
-	DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
 	CustomVersion = security->getString("customversion");
 	HideBans = security->getBool("hidebans");
 	HideServer = security->getString("hideserver", security->getString("hidewhois"));
@@ -414,7 +410,6 @@ 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"));
@@ -429,25 +424,6 @@ void ServerConfig::Fill()
 		RestrictBannedUsers =  ServerConfig::BUT_RESTRICT_NOTIFY;
 	else
 		throw CoreException(restrictbannedusers + " is an invalid <options:restrictbannedusers> value, at " + options->getTagLocation());
-
-	DisabledUModes.reset();
-	std::string modes = ConfValue("disabled")->getString("usermodes");
-	for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
-	{
-		// Complain when the character is not a valid mode character.
-		if (!ModeParser::IsModeChar(*p))
-			throw CoreException("Invalid usermode " + std::string(1, *p) + " was found.");
-		DisabledUModes.set(*p - 'A');
-	}
-
-	DisabledCModes.reset();
-	modes = ConfValue("disabled")->getString("chanmodes");
-	for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
-	{
-		if (!ModeParser::IsModeChar(*p))
-			throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found.");
-		DisabledCModes.set(*p - 'A');
-	}
 }
 
 // WARNING: it is not safe to use most of the codebase in this function, as it
@@ -723,7 +699,6 @@ void ConfigReaderThread::Finish()
 		ServerInstance->Users.RehashCloneCounts();
 		ServerInstance->XLines->CheckELines();
 		ServerInstance->XLines->ApplyLines();
-		Config->ApplyDisabledCommands();
 		User* user = ServerInstance->FindNick(TheUserUID);
 
 		ConfigStatus status(user);