Comments

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

diff --git a/src/users.cpp b/src/users.cpp
index f38b2ca46ed8593ac33160f618dee445eb6fc87c..e66ac7fd9452c7765b51448134196bf615e7259a 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -839,7 +839,7 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
 
        if (BanCacheHit *b = Instance->BanCache->GetHit(New->GetIPString()))
        {
-               if (!b->Type.empty())
+               if (!b->Type.empty() && !New->exempt)
                {
                        /* user banned */
                        Instance->Log(DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
@@ -863,11 +863,7 @@ void User::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, in
                        {
                                Instance->Log(DEBUG, std::string("BanCache: Adding positive hit for ") + New->GetIPString());
                                Instance->BanCache->AddHit(New->GetIPString(), "Z", std::string("Z-Lined: ") + r->reason);
-                               char reason[MAXBUF];
-                               if (*Instance->Config->MoronBanner)
-                                       New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner);
-                               snprintf(reason,MAXBUF,"Z-Lined: %s",r->reason);
-                               User::QuitUser(Instance, New, reason);
+                               r->Apply(New);
                                return;
                        }
                }
@@ -974,11 +970,7 @@ void User::FullConnect()
                if (r)
                {
                        this->muted = true;
-                       char reason[MAXBUF];
-                       if (*ServerInstance->Config->MoronBanner)
-                               this->WriteServ("NOTICE %s :*** %s", this->nick, ServerInstance->Config->MoronBanner);
-                       snprintf(reason,MAXBUF,"G-Lined: %s",r->reason);
-                       User::QuitUser(ServerInstance, this, reason);
+                       r->Apply(this);
                        return;
                }
 
@@ -987,11 +979,7 @@ void User::FullConnect()
                if (n)
                {
                        this->muted = true;
-                       char reason[MAXBUF];
-                       if (*ServerInstance->Config->MoronBanner)
-                               this->WriteServ("NOTICE %s :*** %s", this, ServerInstance->Config->MoronBanner);
-                       snprintf(reason,MAXBUF,"K-Lined: %s",n->reason);
-                       User::QuitUser(ServerInstance, this, reason);
+                       n->Apply(this);
                        return;
                }
        }