Fix STARTTLS sending the 670 numeric within the SSL session, not prior to it

[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 ead8a2021fcaf9712f509c338ec2457af37401a5..d20c9d8dd9cc0308f4de73bf2aaeb370e182f41a 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -280,8 +280,11 @@ class ModuleIdent : public Module
        ModuleIdent() : ext("ident_socket", this)
        {
                OnRehash(NULL);
-               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnUserDisconnect };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               Implementation eventlist[] = {
+                       I_OnRehash, I_OnUserRegister, I_OnCheckReady,
+                       I_OnUserDisconnect, I_OnSetConnectClass
+               };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
        ~ModuleIdent()
@@ -384,6 +387,13 @@ class ModuleIdent : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass)
+       {
+               if (myclass->config->getBool("requireident") && user->ident[0] == '~')
+                       return MOD_RES_DENY;
+               return MOD_RES_PASSTHRU;
+       }
+
        virtual void OnCleanup(int target_type, void *item)
        {
                /* Module unloading, tidy up users */