Prevent using invalid UIDs and enforce UID/SID matching

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

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index b2bbe0d8c45de15992c35d772d190ab2d0fc2328..416b25dd3e4b54eee0c23fad14867835b3c9c982 100644 (file)
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -95,7 +95,7 @@ class CommandJumpserver : public Command
                        if (redirect_all_immediately)
                        {
                                /* Redirect everyone but the oper sending the command */
-                               for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
+                               for (std::vector<LocalUser*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
                                {
                                        User* t = *i;
                                        if (!IS_OPER(t))
@@ -138,15 +138,15 @@ class ModuleJumpServer : public Module
        ModuleJumpServer() : js(this)
        {
                ServerInstance->AddCommand(&js);
-               Implementation eventlist[] = { I_OnUserRegister };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               Implementation eventlist[] = { I_OnUserRegister, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleJumpServer()
        {
        }
 
-       virtual ModResult OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(LocalUser* user)
        {
                if (js.port && js.redirect_new_users)
                {
@@ -158,6 +158,11 @@ class ModuleJumpServer : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       virtual void OnRehash(User* user)
+       {
+               // Emergency way to unlock
+               if (!user) js.redirect_new_users = false;
+       }
 
        virtual Version GetVersion()
        {