X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=e69a944e745dc3b279da4622f17739ae0f7d084b;hb=d556a4f8740b65e635ff7d2b976faaedbdac51d4;hp=0e116888c46a026c41dbb47e2d8868fe33a62d0a;hpb=138fb540716d12bf1f89ec484d3210d921f9f3f7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 0e116888c..e69a944e7 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -11,14 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Provides support for the SETHOST command */
 
 /** Handle /SETHOST
@@ -26,9 +23,9 @@
 class cmd_sethost : public command_t
 {
  private:
-	char*& hostmap;
+	char* hostmap;
  public:
-	cmd_sethost (InspIRCd* Instance, char*& hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
+	cmd_sethost (InspIRCd* Instance, char* hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
 	{
 		this->source = "m_sethost.so";
 		syntax = "<new-hostname>";
@@ -41,10 +38,15 @@ class cmd_sethost : public command_t
 		{
 			if (!hostmap[(unsigned char)*x])
 			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
+				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** SETHOST: Invalid characters in hostname");
 				return CMD_FAILURE;
 			}
 		}
+		if (len == 0)
+		{
+			user->WriteServ("NOTICE %s :*** SETHOST: Host must be specified", user->nick);
+			return CMD_FAILURE;
+		}
 		if (len > 64)
 		{
 			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
@@ -64,13 +66,12 @@ class cmd_sethost : public command_t
 class ModuleSetHost : public Module
 {
 	cmd_sethost* mycommand;
-	char* hostmap;
+	char hostmap[256];
  public:
 	ModuleSetHost(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{	
-		hostmap = new char[256];
-		OnRehash("");
+		OnRehash(NULL,"");
 		mycommand = new cmd_sethost(ServerInstance, hostmap);
 		ServerInstance->AddCommand(mycommand);
 	}
@@ -80,7 +81,7 @@ class ModuleSetHost : public Module
 		List[I_OnRehash] = 1;
 	}
 
-	void OnRehash(const std::string &parameter)
+	void OnRehash(userrec* user, const std::string &parameter)
 	{
 		ConfigReader Conf(ServerInstance);
 		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
@@ -88,14 +89,13 @@ class ModuleSetHost : public Module
 		if (hmap.empty())
 			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
 
-		memset(&hostmap, 0, sizeof(hostmap));
+		memset(&hostmap, 0, 255);
 		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
 			hostmap[(unsigned char)*n] = 1;
 	}
 
 	virtual ~ModuleSetHost()
 	{
-		delete[] hostmap;
 	}
 	
 	virtual Version GetVersion()
@@ -105,27 +105,4 @@ class ModuleSetHost : public Module
 	
 };
 
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
-	ModuleSetHostFactory()
-	{
-	}
-	
-	~ModuleSetHostFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSetHost(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost)