m_spanningtree Add overload for add() and has_room(), giving more flexibility to...

[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 ae21c6940a4cf2d7a89230a6235d0fd3a43d65b8..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
@@ -283,9 +289,7 @@ class ModuleIdent : public Module
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("ident");
-               RequestTimeout = tag->getInt("timeout", 5);
-               if (!RequestTimeout)
-                       RequestTimeout = 5;
+               RequestTimeout = tag->getInt("timeout", 5, 1);
                NoLookupPrefix = tag->getBool("nolookupprefix", false);
        }
 
@@ -362,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)