m_callerid Ignore duplicate entries when unserializing callerid_data

[user/henk/code/inspircd.git] / src / modules / m_connectban.cpp

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index 798f06fb6f5704af2743bc0f9c63f8033507d88d..dc2bc3f18b80eb0aebb3a195712d3e0d43f25806 100644 (file)
--- 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;