Roadmap item "Fix jointhrottle to not try 'throttle' clients during a netmerge (requi...

[user/henk/code/inspircd.git] / src / users.cpp

diff --git a/src/users.cpp b/src/users.cpp
index e21b0d222c2fa5ba4e2539592f80b063e29e865d..54fa2b872bd5d5aaef5c3f38c4a22f31f7a9ab2f 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -861,8 +861,6 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
 
                        if (r)
                        {
-                               Instance->Log(DEBUG, std::string("BanCache: Adding positive hit for ") + New->GetIPString());
-                               Instance->BanCache->AddHit(New->GetIPString(), "Z", std::string("Z-Lined: ") + r->reason);
                                r->Apply(New);
                                return;
                        }
@@ -965,7 +963,7 @@ void User::FullConnect()
 
        if (!this->exempt)
        {
-               XLine* r = ServerInstance->XLines->MatchesLine("G",this);
+               GLine *r = (GLine *)ServerInstance->XLines->MatchesLine("G", this);
 
                if (r)
                {
@@ -974,7 +972,7 @@ void User::FullConnect()
                        return;
                }
 
-               XLine* n = ServerInstance->XLines->MatchesLine("K",this);
+               KLine *n = (KLine *)ServerInstance->XLines->MatchesLine("K", this);
 
                if (n)
                {
@@ -1018,6 +1016,9 @@ void User::FullConnect()
        FOREACH_MOD(I_OnPostConnect,OnPostConnect(this));
 
        ServerInstance->SNO->WriteToSnoMask('c',"Client connecting on port %d: %s!%s@%s [%s] [%s]", this->GetPort(), this->nick, this->ident, this->host, this->GetIPString(), this->fullname);
+
+       ServerInstance->Log(DEBUG, "BanCache: Adding NEGATIVE hit for %s", this->GetIPString());
+       ServerInstance->BanCache->AddHit(this->GetIPString(), "", "");
 }
 
 /** User::UpdateNick()