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

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 6e984a62e..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
@@ -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);
@@ -67,7 +69,7 @@ class ModuleSetHost : public Module
 	char hostmap[256];
  public:
 	ModuleSetHost(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{	
 		OnRehash(NULL,"");
 		mycommand = new cmd_sethost(ServerInstance, hostmap);
@@ -103,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)