X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fconfigreader.cpp;fp=src%2Fconfigreader.cpp;h=0318dd602cb9f071dd9ca5a09369117046e6f23e;hb=9b25df31096f889e3653ab100493133014d4fe73;hp=00880cfff80d88babd47c69d635f644a7d179704;hpb=fa83fac94ab7cb5e18a546858054f3910ef24235;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 00880cfff..0318dd602 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -74,6 +74,8 @@ ServerConfig::~ServerConfig()
 
 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)
 	{
@@ -84,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;
@@ -405,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"));