X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_connectban.cpp;h=26120add984381529a736bcd3af0f8b67b4e0d61;hb=fc4fc43ec232407b38d7ca182cb92c5cac4287aa;hp=798f06fb6f5704af2743bc0f9c63f8033507d88d;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 798f06fb6..26120add9 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -33,7 +33,7 @@ class ModuleConnectBan : public Module
  public:
 	void init()
 	{
-		Implementation eventlist[] = { I_OnUserConnect, I_OnGarbageCollect, I_OnRehash };
+		Implementation eventlist[] = { I_OnSetUserIP, I_OnGarbageCollect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
@@ -68,8 +68,11 @@ class ModuleConnectBan : public Module
 			banduration = 10*60;
 	}
 
-	virtual void OnUserConnect(LocalUser *u)
+	virtual void OnSetUserIP(LocalUser* u)
 	{
+		if (u->exempt)
+			return;
+
 		int range = 32;
 		clonemap::iterator i;
 
@@ -94,11 +97,12 @@ class ModuleConnectBan : public Module
 			{
 				// Create zline for set duration.
 				ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, "Your IP range has been attempting to connect too many times in too short a duration. Wait a while, and you will be able to connect.", mask.str());
-				if (ServerInstance->XLines->AddLine(zl,NULL))
-					ServerInstance->XLines->ApplyLines();
-				else
+				if (!ServerInstance->XLines->AddLine(zl, NULL))
+				{
 					delete zl;
-
+					return;
+				}
+				ServerInstance->XLines->ApplyLines();
 				std::string maskstr = mask.str();
 				std::string timestr = ServerInstance->TimeString(zl->expiry);
 				ServerInstance->SNO->WriteGlobalSno('x',"Module m_connectban added Z:line on *@%s to expire on %s: Connect flooding",