m_namedmodes Build and process a Modes::ChangeList when handling PROP

[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 b86ed2cbe4eacb7aec87821bb07e81d01fcb1227..3e87b8c5a3f0479d536aa63d529769ce41268427 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -263,6 +263,12 @@ class IdentRequestSocket : public EventHandler
                        }
                }
        }
+
+       CullResult cull() CXX11_OVERRIDE
+       {
+               Close();
+               return EventHandler::cull();
+       }
 };
 
 class ModuleIdent : public Module
@@ -360,28 +366,6 @@ class ModuleIdent : public Module
                        return MOD_RES_DENY;
                return MOD_RES_PASSTHRU;
        }
-
-       void OnCleanup(int target_type, void *item) CXX11_OVERRIDE
-       {
-               /* Module unloading, tidy up users */
-               if (target_type == TYPE_USER)
-               {
-                       LocalUser* user = IS_LOCAL((User*) item);
-                       if (user)
-                               OnUserDisconnect(user);
-               }
-       }
-
-       void OnUserDisconnect(LocalUser *user) CXX11_OVERRIDE
-       {
-               /* User disconnect (generic socket detatch event) */
-               IdentRequestSocket *isock = ext.get(user);
-               if (isock)
-               {
-                       isock->Close();
-                       ext.unset(user);
-               }
-       }
 };
 
 MODULE_INIT(ModuleIdent)