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 6e8f00b44725b9bcf93ea9c8ad04ddf09c44b931..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
@@ -27,9 +27,9 @@ class CommandJumpserver : public Command
        std::string reason;
        int port;
 
-       CommandJumpserver (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "JUMPSERVER", "o", 0, 4)
+       CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
        {
-               syntax = "[<server> <port> <+/-an> <reason>]";
+               flags_needed = 'o'; syntax = "[<server> <port> <+/-an> <reason>]";
                redirect_to.clear();
                reason.clear();
                port = 0;
@@ -55,7 +55,7 @@ class CommandJumpserver : public Command
 
                        port = 0;
                        redirect_to.clear();
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
 
                port = 0;
@@ -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))
@@ -126,7 +126,7 @@ class CommandJumpserver : public Command
                                        reason.c_str());
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
@@ -135,19 +135,18 @@ class ModuleJumpServer : public Module
 {
        CommandJumpserver js;
  public:
-       ModuleJumpServer(InspIRCd* Me)
-               : Module(Me), js(Me, this)
+       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)
                {
@@ -159,10 +158,15 @@ 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()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides support for the RPL_REDIR numeric", VF_VENDOR);
        }
 
 };