m_spanningtree Call the collision handler with the proper parameter (client ip instea...

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index a8a81daef3fa0d167695e178a88ec785e822fb17..86b6d8d3ce7e4dfce07c54dc99365463d0ef3944 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -337,7 +337,7 @@ public:
                ServerInstance->Modules->AddService(cmd);
                ServerInstance->Modules->AddService(cmd.extInfo);
 
-               Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
+               Implementation eventlist[] = { I_OnRehash, I_OnUserPostNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
                ServerInstance->Modules->Attach(eventlist, this, 6);
        }
 
@@ -399,11 +399,10 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnUserPreNick(User* user, const std::string& newnick)
+       void OnUserPostNick(User* user, const std::string& oldnick)
        {
                if (!tracknick)
                        RemoveFromAllAccepts(user);
-               return MOD_RES_PASSTHRU;
        }
 
        void OnUserQuit(User* user, const std::string& message, const std::string& oper_message)