Remove negative BanCache entries only when the AddLine is successful instead of remov...

diff --git a/src/xline.cpp b/src/xline.cpp
index ed3ed6364b1ef01714867cf57e0f64026211c48c..397b937ec8057aa06fd8d1f8ec04f21eeefd2e66 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -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.
 
@@ -273,6 +271,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);