Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 5a56fe576656065cce5c88c0582e959ea173f97a..81e2cf6c8ab956fe8ae4aca03b49b0c9506f4f4e 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
@@ -40,14 +35,14 @@ class cmd_userip : public command_t
                        userrec *u = ServerInstance->FindNick(parameters[i]);
                        if ((u) && (u->registered == REG_ALL))
                        {
-                               retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString();
+                               retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString() + " ";
                        }
                }
 
                user->WriteServ(retbuf);
 
                /* Dont send to the network */
-               return CMD_FAILURE;
+               return CMD_LOCALONLY;
        }
 };
 
@@ -56,7 +51,7 @@ class ModuleUserIP : public Module
        cmd_userip* mycommand;
  public:
        ModuleUserIP(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                mycommand = new cmd_userip(ServerInstance);
@@ -84,29 +79,5 @@ class ModuleUserIP : public Module
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleUserIPFactory : public ModuleFactory
-{
- public:
-       ModuleUserIPFactory()
-       {
-       }
-       
-       ~ModuleUserIPFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleUserIP(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleUserIPFactory;
-}
+MODULE_INIT(ModuleUserIP)