X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=66d24f439a6b12b600033a17bf40ef3b72ba6efd;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=ed3ed6364b1ef01714867cf57e0f64026211c48c;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index ed3ed6364..66d24f439 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -156,7 +156,7 @@ void XLineManager::CheckELines()
 	if (ELines.empty())
 		return;
 
-	for (std::vector<LocalUser*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+	for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 
@@ -241,7 +241,7 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
 	}
 	else
 	{
-		n.first = "";
+		n.first.clear();
 		n.second = ident_and_host;
 	}
 
@@ -252,8 +252,6 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
 
 bool XLineManager::AddLine(XLine* line, User* user)
 {
-	ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
-
 	if (line->duration && ServerInstance->Time() > line->expiry)
 		return false; // Don't apply expired XLines.
 
@@ -264,7 +262,12 @@ bool XLineManager::AddLine(XLine* line, User* user)
 		LookupIter i = x->second.find(line->Displayable());
 		if (i != x->second.end())
 		{
-			return false;
+			// XLine propagation bug was here, if the line to be added already exists and
+			// it's expired then expire it and add the new one instead of returning false
+			if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry))
+				return false;
+
+			ExpireLine(x, i);
 		}
 	}
 
@@ -273,6 +276,8 @@ bool XLineManager::AddLine(XLine* line, User* user)
 	if (!xlf)
 		return false;
 
+	ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
+
 	if (xlf->AutoApplyToUserList(line))
 		pending_lines.push_back(line);
 
@@ -321,7 +326,7 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User*
 void ELine::Unset()
 {
 	/* remove exempt from everyone and force recheck after deleting eline */
-	for (std::vector<LocalUser*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+	for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 		u->exempt = false;
@@ -425,7 +430,7 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
 // applies lines, removing clients and changing nicks etc as applicable
 void XLineManager::ApplyLines()
 {
-	std::vector<LocalUser*>::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin();
+	LocalUserList::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin();
 	while (u2 != ServerInstance->Users->local_users.rend())
 	{
 		User* u = *u2++;
@@ -447,8 +452,6 @@ void XLineManager::ApplyLines()
 
 void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results)
 {
-	std::string sn = ServerInstance->Config->ServerName;
-
 	ContainerIter n = lookup_lines.find(type);
 
 	time_t current = ServerInstance->Time();
@@ -468,8 +471,8 @@ void XLineManager::InvokeStats(const std::string &type, int numeric, User* user,
 				ExpireLine(n, i);
 			}
 			else
-				results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
-					ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+std::string(i->second->source)+" :"+(i->second->reason));
+				results.push_back(ServerInstance->Config->ServerName+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+
+					ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+i->second->source+" :"+i->second->reason);
 			i = safei;
 		}
 	}
@@ -504,8 +507,6 @@ XLineManager::~XLineManager()
 	for(unsigned int i=0; i < sizeof(gekqz); i++)
 	{
 		XLineFactory* xlf = GetFactory(std::string(1, gekqz[i]));
-		if (xlf)
-			UnregisterFactory(xlf);
 		delete xlf;
 	}
 
@@ -516,10 +517,7 @@ XLineManager::~XLineManager()
 		{
 			delete j->second;
 		}
-		i->second.clear();
 	}
-	lookup_lines.clear();
-
 }
 
 void XLine::Apply(User* u)
@@ -546,7 +544,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 
 	if (bancache)
 	{
-		ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString());
+		ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
 		if (this->duration > 0)
 			ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration);
 		else
@@ -681,7 +679,7 @@ bool GLine::Matches(const std::string &str)
 void ELine::OnAdd()
 {
 	/* When adding one eline, only check the one eline */
-	for (std::vector<LocalUser*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+	for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 		if (this->Matches(u))