X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=66d24f439a6b12b600033a17bf40ef3b72ba6efd;hb=748b3a0d89e7ecc9a766471b79fb78f63a5ca2bb;hp=6ec0723eccbe6124caff889f1a0eb9584f642412;hpb=c8b41aa5d256d99eee67ec94492a94dc30e0ea35;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 6ec0723ec..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;
 	}
 
@@ -262,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);
 		}
 	}
 
@@ -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++;
@@ -674,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))