Add extra parameter to OnUserPreNotice and OnUserPrePrivmsg, CUList &exempt_list...

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

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 707193fc6c938456a7075a84847025c4d63821c1..dc59adcead13a766a2cb569211724650806b69ca 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -208,7 +208,7 @@ class ModuleIdent : public Module
                ReadSettings();
        }
 
-       virtual void OnUserRegister(userrec* user)
+       virtual int OnUserRegister(userrec* user)
        {
                /*
                 * when the new user connects, before they authenticate with USER/NICK/PASS, we do
@@ -231,6 +231,7 @@ class ModuleIdent : public Module
                        strlcpy(user->ident,newident,IDENTMAX);
                        delete ident;
                }
+               return 0;
        }
 
        virtual bool OnCheckReady(userrec* user)
@@ -257,6 +258,8 @@ class ModuleIdent : public Module
                                // a user which has now vanished! To prevent this, set ident::u
                                // to NULL and check it so that we dont write users who have gone away.
                                ident->u = NULL;
+                               ServerInstance->SE->DelFd(ident);
+                               delete ident;
                        }
                }
        }
@@ -275,6 +278,8 @@ class ModuleIdent : public Module
                if (user->GetExt("ident_data", ident))
                {
                        ident->u = NULL;
+                       ServerInstance->SE->DelFd(ident);
+                       delete ident;
                }
        }